Merge branch 'release/v3.0.x'

* release/v3.0.x: (335 commits) Bump android version to v2.40.0-36176140 (nightly) Bump iOS version to v3.0.8-374 Bump android version to v3.0.8-36176141 v3.0.8 fix/discover remove apps link for ios on discover fix/privacypolicy url issue for turk + fix/onboarding quizz double click issue Bump android version to v2.40.0-36176139 (nightly) Bump iOS version to v3.0.7-373 Bump android version to v3.0.7-36176140 v3.0.7 LIVE-1954 fix market no network indicator LIVE-1983 fix external web link issue in onboarding Bump android version to v2.40.0-36176138 (nightly) Bump iOS version to v3.0.6-372 Bump android version to v3.0.6-36176139 v3.0.6 fix/assets sync indicator spin missing bugfix/tron-edit-votes-keyboard-view-missing fixed (#2433) fix/wallet connect issue in react missuse of a hook fix/nft deactivate pan and zoom for now ...
LedgerHQ · Apr 22, 2022 · 9f295e8 · 9f295e8
2 parents f840f49 + 728ad10
commit 9f295e8
Show file tree

Hide file tree

Showing 917 changed files with 41,270 additions and 105,144 deletions.
diff --git a/.bundle/config b/.bundle/config
@@ -1,2 +1,3 @@
 ---
 BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/.env.adhoc b/.env.adhoc
@@ -1,3 +1,4 @@
 APP_NAME="LL DEV"
-SENTRY_DSN=https://[email protected]/273101
+SENTRY_ENVIRONMENT=adhoc
+SENTRY_DSN=https://[email protected]/6323440
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
diff --git a/.env.mock b/.env.mock
@@ -3,3 +3,4 @@ MOCK=1
 DISABLE_YELLOW_BOX=1
 MOCK_SCAN_RECIPIENT=bitcoin:3HX3Q4wgYi8nKakxv7kmdCgLWJFrFgcqEt?amount=0.001
 FORCE_DEBUG_VISIBLE=1
+ADJUST_APP_TOKEN=cbxft2ch7wn4
diff --git a/.env.production b/.env.production
@@ -1,3 +1,6 @@
 APP_NAME="Ledger Live"
-SENTRY_DSN=https://[email protected]/273101
+SENTRY_ENVIRONMENT=production
+SENTRY_DSN=https://[email protected]/6323440
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
+ADJUST_APP_TOKEN=104p56owfekg
diff --git a/.env.staging b/.env.staging
@@ -1,3 +1,6 @@
 APP_NAME="LL [STAGING]"
-SENTRY_DSN=https://[email protected]/273101
+SENTRY_ENVIRONMENT=staging
+SENTRY_DSN=https://[email protected]/6323440
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Staging"
+ADJUST_APP_TOKEN=v88jjyrsto8w
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,30 +19,36 @@ jobs:
       - uses: actions/setup-node@master
         with:
           node-version: 14.x
-
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
-
       - uses: actions/cache@v1
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-
+      - uses: ledgerhq/actions/packages/has-hash-commit-deps@main
+        id: has-hash-commit-deps
+        with:
+          workspace: ${{ github.workspace }}
       - name: install dependencies
-        run: yarn
-
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'true' }}
+        env:
+          JOBS: max
+        run: yarn --frozen-lockfile --network-timeout 100000 --network-concurrency 1
+      - name: install dependencies
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'false' }}
+        env:
+          JOBS: max
+        run: yarn --frozen-lockfile --network-timeout 100000
       - name: test
         run: yarn test
-
       - name: flow
         run: yarn flow
-
       - name: crowdin protect
         run: yarn global add jsonlint && jsonlint src/locales/en/common.json
diff --git a/.github/workflows/bundle-app.yml b/.github/workflows/bundle-app.yml
@@ -8,17 +8,12 @@ on:
       - develop
       - master
 
-jobs:
-  cancel-previous:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   check-if-fork:
-    needs: [cancel-previous]
     runs-on: ubuntu-20.04
     outputs:
       forked: ${{ steps.forked.outputs.forked }}
@@ -86,7 +81,19 @@ jobs:
           java-version: 1.8
       - name: Setup Android SDK
         uses: android-actions/[email protected]
+      - uses: ledgerhq/actions/packages/has-hash-commit-deps@main
+        id: has-hash-commit-deps
+        with:
+          workspace: ${{ github.workspace }}
       - name: install dependencies
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'true' }}
+        env:
+          JOBS: max
+        run: yarn --frozen-lockfile --network-timeout 100000 --network-concurrency 1
+      - name: install dependencies
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'false' }}
+        env:
+          JOBS: max
         run: yarn --frozen-lockfile --network-timeout 100000
       - uses: ledgerhq/actions/[email protected]
         id: version
@@ -134,7 +141,19 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6
+      - uses: ledgerhq/actions/packages/has-hash-commit-deps@main
+        id: has-hash-commit-deps
+        with:
+          workspace: ${{ github.workspace }}
       - name: install dependencies
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'true' }}
+        env:
+          JOBS: max
+        run: yarn --frozen-lockfile --network-timeout 100000 --network-concurrency 1
+      - name: install dependencies
+        if: ${{ steps.has-hash-commit-deps.outputs.has-hash-commit-deps == 'false' }}
+        env:
+          JOBS: max
         run: yarn --frozen-lockfile --network-timeout 100000
       - uses: ledgerhq/actions/[email protected]
         id: version

diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #

diff --git a/Gemfile b/Gemfile
@@ -4,5 +4,6 @@ gem "fastlane"
 gem "dotenv"
 gem "cocoapods", "1.11.2"
 
+
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -88,14 +88,19 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    enableHermes: false,  // clean and rebuild if changing
+    /**
+     * Clean and rebuild if changing
+     * The following env var is not read from ../.env, you need to export this var like this: `export HERMES_ENABLED_ANDROID=true`
+     */
+    enableHermes: true,
     // bundleInDebug: true, // Uncomment this to debug java without having to deal with JS dev server (metro)
 ]
 project.ext.sentryCli = [
     logLevel: "debug"
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
+apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -123,9 +128,9 @@ def enableProguardInReleaseBuilds = false
  * give correct results when using with locales other than en-US.  Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc-intl:+'
+// def jscFlavor = 'org.webkit:android-jsc-intl:+'
 
-def useIntlJsc = true
+// def useIntlJsc = true
 
 /**
  * Whether to enable the Hermes VM.
@@ -136,6 +141,11 @@ def useIntlJsc = true
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
     ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -147,8 +157,8 @@ android {
         multiDexEnabled true
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4195723
-        versionName "2.39.1"
+        versionCode 36176141
+        versionName "3.0.8"
         resValue "string", "build_config_package", "com.ledger.live"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -181,6 +191,11 @@ android {
         debug {
             signingConfig signingConfigs.debug
             applicationIdSuffix ".debug"
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
@@ -194,12 +209,6 @@ android {
             matchingFallbacks = ['release']
         }
     }
-
-    // As required by https://github.com/react-native-community/jsc-android-buildscripts#for-react-native-version-059
-    packagingOptions {
-        pickFirst '**/libjsc.so'
-        pickFirst '**/libc++_shared.so'
-    }
 }
 
 dependencies {
@@ -224,14 +233,20 @@ dependencies {
         exclude group:'com.facebook.flipper'
     }
 
-    if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
-    } else {
-        implementation jscFlavor
-    }
+
+    def hermesPath = "../../node_modules/hermes-engine/android/";
+    debugImplementation files(hermesPath + "hermes-debug.aar")
+    stagingReleaseImplementation files(hermesPath + "hermes-release.aar")
+    releaseImplementation files(hermesPath + "hermes-release.aar")
+
     androidTestImplementation('com.wix:detox:+')
+
+    compile project(':react-native-video')
+    implementation "androidx.appcompat:appcompat:1.0.0"
+
+    // Adjust
+    compile 'com.google.android.gms:play-services-analytics:10.0.1'
+    compile 'com.android.installreferrer:installreferrer:1.0'
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/android/app/google-services.json b/android/app/google-services.json
@@ -1,37 +1,37 @@
 {
   "project_info": {
-    "project_number": "148270189806",
-    "project_id": "ledger-live-12a1c",
-    "storage_bucket": "ledger-live-12a1c.appspot.com"
+    "project_number": "750497694072",
+    "project_id": "ledger-live-development",
+    "storage_bucket": "ledger-live-development.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:148270189806:android:3966cda8e9392a469677ff",
+        "mobilesdk_app_id": "1:750497694072:android:6b1eb6a6c682918ebac88d",
         "android_client_info": {
           "package_name": "com.ledger.live"
         }
       },
       "oauth_client": [
         {
-          "client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
+          "client_id": "750497694072-o12089ablhn4onf4p23fgik63esg40fm.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDFTyzJvgWMdh5Zw5Sy3eCEAtG3VXnHIoc"
+          "current_key": "AIzaSyDWIt0vi7fpMsjA0McSvRqSCL5VUctY4p4"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
+              "client_id": "750497694072-o12089ablhn4onf4p23fgik63esg40fm.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "148270189806-eeecurvvue99to9j53hhi24mh27cdhva.apps.googleusercontent.com",
+              "client_id": "750497694072-e41g4om5ndmooikbooo0c2r5llh02jaj.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
                 "bundle_id": "ledgerlivemobile"
@@ -43,67 +43,31 @@
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:148270189806:android:85f7bbda09f07e369677ff",
+        "mobilesdk_app_id": "1:750497694072:android:14f460b362b84225bac88d",
         "android_client_info": {
           "package_name": "com.ledger.live.debug"
         }
       },
       "oauth_client": [
         {
-          "client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
+          "client_id": "750497694072-o12089ablhn4onf4p23fgik63esg40fm.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDFTyzJvgWMdh5Zw5Sy3eCEAtG3VXnHIoc"
+          "current_key": "AIzaSyDWIt0vi7fpMsjA0McSvRqSCL5VUctY4p4"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "148270189806-hjcg6kgus98c0at53s7jscfc99ngcjjg.apps.googleusercontent.com",
+              "client_id": "750497694072-o12089ablhn4onf4p23fgik63esg40fm.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_id": "750497694072-e41g4om5ndmooikbooo0c2r5llh02jaj.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
                 "bundle_id": "ledgerlivemobile"
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ build/ @@
     .gradle
     local.properties
     *.iml
+    *.hprof
     # node.js
     #
@@ Expand Down @@