Merge branch 'LL-7742' into support/LIVE-1622-tx-flow-cleanup

LedgerHQ · Mar 16, 2022 · 1c2e6ff · 1c2e6ff
2 parents 57cce40 + a1183e0
commit 1c2e6ff
Show file tree

Hide file tree

Showing 245 changed files with 10,674 additions and 105,031 deletions.
diff --git a/.env.production b/.env.production
@@ -1,3 +1,4 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://beb25fd89630498990fd16bbc5b92fc1@sentry.io/273101
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
diff --git a/.env.staging b/.env.staging
@@ -1,3 +1,4 @@
 APP_NAME="LL [STAGING]"
 SENTRY_DSN=https://beb25fd89630498990fd16bbc5b92fc1@sentry.io/273101
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Staging"
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/cancel-workflow-action@0.4.0
-        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/setup-android@v2.0.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/get-package-infos@v1.0.0
         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/get-package-infos@v1.0.0
         id: version

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         multiDexEnabled true
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4195713
-        versionName "2.38.3"
+        versionCode 4195727
+        versionName "2.40.0"
         resValue "string", "build_config_package", "com.ledger.live"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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"

diff --git a/android/app/src/stagingRelease/google-services.json b/android/app/src/stagingRelease/google-services.json
@@ -0,0 +1,46 @@
+{
+  "project_info": {
+    "project_number": "1008987457941",
+    "project_id": "ledger-live-staging",
+    "storage_bucket": "ledger-live-staging.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1008987457941:android:de51cf6ca928b8b7d6ce9c",
+        "android_client_info": {
+          "package_name": "com.ledger.live.staging"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1008987457941-vc3pch5c1ipgmacm4enq1i6hido2p0sc.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDiB8x0zLvlJ_g8K0D5sSC1XQwS9l4_0DQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "1008987457941-vc3pch5c1ipgmacm4enq1i6hido2p0sc.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "1008987457941-vbr7k0on8ttgdc48281o3lrf6kp7vtkn.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "ledgerlivemobile"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/index.js b/index.js
@@ -9,6 +9,9 @@ import "react-native-gesture-handler";
 // https://github.com/facebook/react-native/issues/23922
 import "react-native-url-polyfill/auto";
 
+// cosmjs use TextEncoder that's not available in React Native but on Node
+import "text-encoding-polyfill";
+
 import { AppRegistry } from "react-native";
 import * as Sentry from "@sentry/react-native";
 import Config from "react-native-config";

diff --git a/ios/GoogleService-Info.dev.plist → ios/GoogleService-Info-Production.plist b/ios/GoogleService-Info.dev.plist → ios/GoogleService-Info-Production.plist
@@ -3,21 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>148270189806-eeecurvvue99to9j53hhi24mh27cdhva.apps.googleusercontent.com</string>
+	<string>212042068804-n7rglq1e800k8fo9urt70etkbh2tia8l.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.148270189806-eeecurvvue99to9j53hhi24mh27cdhva</string>
+	<string>com.googleusercontent.apps.212042068804-n7rglq1e800k8fo9urt70etkbh2tia8l</string>
 	<key>API_KEY</key>
-	<string>AIzaSyAE8-ng2QQJzVY-TgyJNYDKP3GPbU-dTm8</string>
+	<string>AIzaSyDBE3vnLXy4ZFArrIvwGth7ezo55dvCO6Q</string>
 	<key>GCM_SENDER_ID</key>
-	<string>148270189806</string>
+	<string>212042068804</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
 	<string>ledgerlivemobile</string>
 	<key>PROJECT_ID</key>
-	<string>ledger-live-12a1c</string>
+	<string>ledger-live-production</string>
 	<key>STORAGE_BUCKET</key>
-	<string>ledger-live-12a1c.appspot.com</string>
+	<string>ledger-live-production.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -29,6 +29,6 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:148270189806:ios:5a0db3a149d0da9a9677ff</string>
+	<string>1:212042068804:ios:3f1c7047887efdc2b51d11</string>
 </dict>
 </plist>
diff --git a/ios/GoogleService-Info-Staging.plist b/ios/GoogleService-Info-Staging.plist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>1008987457941-vbr7k0on8ttgdc48281o3lrf6kp7vtkn.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.1008987457941-vbr7k0on8ttgdc48281o3lrf6kp7vtkn</string>
+	<key>API_KEY</key>
+	<string>AIzaSyCrw--pa0Ih4rxdBPAfNnj6PMMwNN6HdM4</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1008987457941</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>ledgerlivemobile</string>
+	<key>PROJECT_ID</key>
+	<string>ledger-live-staging</string>
+	<key>STORAGE_BUCKET</key>
+	<string>ledger-live-staging.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1008987457941:ios:11d14752e413b795d6ce9c</string>
+</dict>
+</plist>