Regions v3 regression, Intl polyfill

.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

.env.production

@@ -1,4 +1,5 @@
 APP_NAME="Ledger Live"
 SENTRY_DSN=https://[email protected]/273101
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
-GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Production"
+ADJUST_APP_TOKEN=104p56owfekg

.env.staging

@@ -1,4 +1,5 @@
 APP_NAME="LL [STAGING]"
 SENTRY_DSN=https://[email protected]/273101
 ANALYTICS_TOKEN=jfUZbw28ig8JpEi9DZpTUc21dKUKu1e3
-GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Staging"
+GOOGLE_SERVICE_INFO_NAME="GoogleService-Info-Staging"
+ADJUST_APP_TOKEN=v88jjyrsto8w

android/app/build.gradle

@@ -88,7 +88,11 @@ 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 = [
@@ -123,9 +127,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.
@@ -152,7 +156,7 @@ android {
         multiDexEnabled true
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36176128
+        versionCode 4195727
         versionName "2.40.0"
         resValue "string", "build_config_package", "com.ledger.live"
         testBuildType System.getProperty('testBuildType', 'debug')
@@ -204,12 +208,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 {
@@ -234,16 +232,20 @@ dependencies {
         exclude group:'com.facebook.flipper'
     }
 
-    debugImplementation project(':flipper-plugin-rn-performance-android')
 
-    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

android/app/proguard-rules.pro

@@ -8,3 +8,21 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+
+
+# Hermes config, cf. https://reactnative.dev/docs/hermes#android
+-keep class com.facebook.hermes.unicode.** { *; }
+-keep class com.facebook.jni.** { *; }
+
+-keep class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+    int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+    com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+    java.lang.String getId();
+    boolean isLimitAdTrackingEnabled();
+}
+-keep public class com.android.installreferrer.** { *; }

android/app/src/debug/java/com/ledger/live/ReactNativeFlipper.java

@@ -36,6 +36,7 @@ public static void initializeFlipper(Context context, ReactInstanceManager react
       client.addPlugin(new SharedPreferencesFlipperPlugin(context));
       client.addPlugin(new RNPerfMonitorPlugin(reactInstanceManager));
       client.addPlugin(CrashReporterPlugin.getInstance());
+      client.addPlugin(new RNPerfMonitorPlugin(reactInstanceManager));
 
       NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
       NetworkingModule.setCustomClientBuilder(
@@ -71,4 +72,4 @@ public void run() {
       }
     }
   }
-}
+}

android/app/src/main/AndroidManifest.xml

@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- react-native-share base64 sharing (swap history/logs export)-->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- Needed by Flipper 🐬 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Needed by Adjust -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/> <!-- Needed by Adjust -->
     <uses-sdk
         android:targetSdkVersion="27"
         tools:overrideLibrary="com.ledger.reactnative" />

android/app/src/main/java/com/ledger/live/MainApplication.java

@@ -15,6 +15,7 @@
 import com.facebook.react.bridge.JSIModulePackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
+import com.brentvatne.react.ReactVideoPackage;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
@@ -42,6 +43,7 @@ protected List<ReactPackage> getPackages() {
           @SuppressWarnings("UnnecessaryLocalVariable")
           List<ReactPackage> packages = new PackageList(this).getPackages();
           packages.add(new BluetoothHelperPackage());
+          packages.add(new ReactVideoPackage());
           return packages;
         }
 

android/build.gradle

@@ -35,11 +35,13 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
         }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
         }
-        mavenCentral()
         google()
         maven { url 'https://jitpack.io' }
         maven {
@@ -48,6 +50,7 @@ allprojects {
         maven {
             url "$rootDir/../node_modules/expo-camera/android/maven"
         }
+        jcenter()
     }
     configurations.all {
         resolutionStrategy {

android/settings.gradle

@@ -4,10 +4,10 @@ project(':react-native-webview').projectDir = new File(rootProject.projectDir, '
 
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 
-include ':flipper-plugin-rn-performance-android'
-project(':flipper-plugin-rn-performance-android').projectDir = new File(rootProject.projectDir, '../node_modules/flipper-plugin-rn-performance-android')
-
 include ':app'
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute().text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
+useExpoModules()
+
+include ':react-native-video'
+project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')

babel.config.js

@@ -1,4 +1,7 @@
 module.exports = {
   presets: ["module:metro-react-native-babel-preset"],
-  plugins: ["react-native-reanimated/plugin"],
+  plugins: [
+    "react-native-reanimated/plugin",
+    "@babel/plugin-transform-named-capturing-groups-regex",
+  ],
 };

docs/analytics.md

@@ -0,0 +1,44 @@
+### Analytics
+
+We use a lightweight opt-out analytics layer composed of different api and sdk.
+
+These tools are targetted towards internal contributors only or with
+
+- **_Adjust integration_** 🠒 Installs data analytics
+
+  Several dev environments are available to track installs of apps
+  Debug, Staging and Prod
+
+  In order to log events add this to your target build dot-env file
+
+  ```
+  DEBUG_ADJUST_LOGS=true
+  ```
+
+  For more details on how to work with the SDK check the adjust doc [here](https://github.com/adjust/react_native_sdk)
+
+* **_Segment integration_** 🠒 General use analytics
+
+in order to track events we use segment API with specific react API
+
+```js
+import { Track, TrackScreen } from "../analytics";
+import Button from "./Button";
+
+...
+<Track
+  onMount
+  event={`Event - ${data}`}
+  eventProperties={{ myData: data }}
+/>
+<TrackScreen category="ScreenCategory" name="FirstScreen" />
+<Button onPress={callback} event="ButtonPress" eventProperties={{ myData: data }} />
+...
+
+```
+
+`Track` helps track events that can be linked to a component lifecycle.
+
+`TracScreen` tracks mount events on a page with a formatted category (section of the app) and screen name.
+
+`Button` helps track click/press events with event and eventProperties props.