Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/2.39.0'
Browse files Browse the repository at this point in the history
* release/2.39.0: (264 commits)
  Bump iOS version to v2.39.1-358
  Bump android version to v2.39.1-4195723
  v2.39.1
  LIVE-1470 Guide users to onboarding if possible (#2255)
  Bump iOS version to v2.39.0-357
  Bump android version to v2.39.0-4195712
  v2.39.0
  fix lint
  Bump urijs from 1.19.7 to 1.19.8 (#2244)
  Bump android version to v2.37.3-4194699 (nightly)
  Bump url-parse from 1.5.7 to 1.5.10 (#2245)
  Add debug credentials for Android (#2246)
  Bump android version to v2.37.3-4194698 (nightly)
  Add staging config for Android (#2243)
  Make prod config the default one (#2241)
  New Crowdin updates (#2229)
  Update Firebase credentials (#2235)
  LIVE-590 LIVE-1400 Handle pairing bugs on 2.0.2 (#2231)
  Bump android version to v2.37.3-4194697 (nightly)
  Bump url-parse from 1.5.4 to 1.5.7 (#2224)
  ...
  • Loading branch information
valpinkman committed Mar 7, 2022
2 parents 3e571b7 + 2dbdef9 commit f840f49
Show file tree
Hide file tree
Showing 295 changed files with 13,856 additions and 39,182 deletions.
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
settings: {
"import/resolver": {
node: {
extensions: [".js", ".android.js", ".ios.js"],
extensions: [".js", ".android.js", ".ios.js", ".ts", ".tsx"],
},
},
},
Expand Down
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ esproposal.optional_chaining=enable
esproposal.nullish_coalescing=enable

module.file_ext=.js
module.file_ext=.tsx
module.file_ext=.json
module.file_ext=.ios.js

Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/bundle-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ jobs:
outputs:
forked: ${{ steps.forked.outputs.forked }}
steps:
- name: echo
run: |
echo ${{ github.event.pull_request.head.repo.full_name }}
echo ${{ github.repository }}
- name: check if we are on a forked repo
id: forked
run: echo "::set-output name=forked::$(${{github.event.pull_request.head.repo.full_name != github.repository}})"
run: echo "::set-output name=forked::$(${{ github.event.pull_request.head.repo.full_name != github.repository }})"

start-runner:
needs: [check-if-fork]
if: ${{ !needs.check-if-fork.outputs.forked }}
if: ${{ !needs.check-if-fork.outputs.forked && github.actor != 'dependabot[bot]' }}
name: "start ec2 instance (Linux)"
uses: ledgerhq/actions/.github/workflows/start-linux-runner.yml@main
with:
Expand All @@ -41,7 +45,7 @@ jobs:
name: "stop ec2 instance (Linux)"
needs: [start-runner, bundle-apk-hosted]
uses: ledgerhq/actions/.github/workflows/stop-linux-runner.yml@main
if: ${{ always() }}
if: ${{ always() && !needs.check-if-fork.outputs.forked && github.actor != 'dependabot[bot]' }}
with:
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
Expand Down Expand Up @@ -100,6 +104,7 @@ jobs:
ANDROID_KEYSTORE_PASS: staging
ANDROID_KEY_ALIAS: staging
ANDROID_KEY_PASS: staging
NODE_OPTIONS: "--max-old-space-size=7168"
run: ANDROID_KEYSTORE_FILE="$(pwd)/android/app/staging.kstr" yarn android:local:apk
- uses: ledgerhq/actions/[email protected]
id: post-version
Expand All @@ -111,7 +116,7 @@ jobs:

bundle-apk-guest:
needs: [check-if-fork]
if: needs.check-if-fork.outputs.forked
if: ${{ needs.check-if-fork.outputs.forked || github.actor == 'dependabot[bot]' }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -147,6 +152,7 @@ jobs:
ANDROID_KEYSTORE_PASS: staging
ANDROID_KEY_ALIAS: staging
ANDROID_KEY_PASS: staging
NODE_OPTIONS: "--max-old-space-size=7168"
run: ANDROID_KEYSTORE_FILE="$(pwd)/android/app/staging.kstr" yarn android:local:apk
- uses: ledgerhq/actions/[email protected]
id: post-version
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/checklist-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: "PR | Checklist"
on:
pull_request:
branches:
- develop
types: [opened, reopened]

jobs:
comment-on-pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
repository: ${{github.event.pull_request.head.repo.full_name}}
persist-credentials: false
- name: comment on PR (support and bugfix branches)
if: contains(github.head_ref, 'support/') || contains(github.head_ref, 'bugfix/')
uses: actions/github-script@v5
with:
script: |
await github.rest.issues.createComment({
owner: "LedgerHQ",
repo: "ledger-live-mobile",
issue_number: "${{ github.event.pull_request.number }}",
body: `
Thanks for your contribution.
To be able to merge in _develop_ branch, you need to:
- [ ] pass the CI
- [ ] if needed, run \`/generate-screenshots\`
- [ ] have a dev review
- [ ] have a QA review
- [ ] if needed, \`/upgrade-llc\`
### Why /generate-screenshots ?
If your PR contains UI related changes,
it might be necessary to regenerate screenshots.
### Why /upgrade-llc ?
If your PR requires an update to the ledger-live-common library,
once the PR is merged on develop on ledger-live-common side,
you need to run \`/upgrade-llc\` to switch back to ledger-live-common@develop here before merging.
`
});
- name: comment on PR (feature branches)
if: contains(github.head_ref, 'feat/')
uses: actions/github-script@v5
with:
script: |
await github.rest.issues.createComment({
owner: "LedgerHQ",
repo: "ledger-live-mobile",
issue_number: "${{ github.event.pull_request.number }}",
body: `
Thanks for your contribution.
To be groomed for next release, you need to:
- [ ] pass the CI
- [ ] if needed, run \`/generate-screenshots\`
- [ ] have a dev review
- [ ] have a QA review
### Why /generate-screenshots ?
If your PR contains UI related changes,
it might be necessary to regenerate screenshots.
`
});
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ artifacts/

#CI
**/vendor/**
**/*.jks
**/*.jks
11 changes: 9 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: 'com.google.gms.google-services'

project.ext.envConfigFiles = [
debug: ".env",
Expand Down Expand Up @@ -124,6 +125,8 @@ def enableProguardInReleaseBuilds = false
*/
def jscFlavor = 'org.webkit:android-jsc-intl:+'

def useIntlJsc = true

/**
* Whether to enable the Hermes VM.
*
Expand All @@ -144,8 +147,8 @@ android {
multiDexEnabled true
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 4195692
versionName "2.37.4"
versionCode 4195723
versionName "2.39.1"
resValue "string", "build_config_package", "com.ledger.live"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down Expand Up @@ -206,6 +209,10 @@ dependencies {

implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

implementation platform('com.google.firebase:firebase-bom:29.0.3')

implementation 'com.google.firebase:firebase-analytics'

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni'
}
Expand Down
118 changes: 118 additions & 0 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"project_info": {
"project_number": "148270189806",
"project_id": "ledger-live-12a1c",
"storage_bucket": "ledger-live-12a1c.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:148270189806:android:3966cda8e9392a469677ff",
"android_client_info": {
"package_name": "com.ledger.live"
}
},
"oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDFTyzJvgWMdh5Zw5Sy3eCEAtG3VXnHIoc"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "148270189806-eeecurvvue99to9j53hhi24mh27cdhva.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "ledgerlivemobile"
}
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:148270189806:android:85f7bbda09f07e369677ff",
"android_client_info": {
"package_name": "com.ledger.live.debug"
}
},
"oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDFTyzJvgWMdh5Zw5Sy3eCEAtG3VXnHIoc"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "148270189806-eeecurvvue99to9j53hhi24mh27cdhva.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "ledgerlivemobile"
}
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:148270189806:android:b57f41d567281c3b9677ff",
"android_client_info": {
"package_name": "com.ledger.live.staging"
}
},
"oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDFTyzJvgWMdh5Zw5Sy3eCEAtG3VXnHIoc"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "148270189806-eeecurvvue99to9j53hhi24mh27cdhva.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "ledgerlivemobile"
}
}
]
}
}
}
],
"configuration_version": "1"
}
Binary file modified android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Ionicons.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/MaterialIcons.ttf
Binary file not shown.
Loading

0 comments on commit f840f49

Please sign in to comment.