Revert "Merge branch 'develop' into production"

This reverts commit f58cf0d, reversing
changes made to d67eed8.

apps/wallet-mobile/.env

@@ -3,7 +3,7 @@ COMMIT=cc2ffa0d
 BUILD_VARIANT=STAGING
 SENTRY=https://fb3745d47d994059917e358dae581466@o1138840.ingest.sentry.io/4505319746764800
 
-DISABLE_LOGBOX=true
+DISABLE_LOG_BOX=true
 SHOW_PROD_POOLS_IN_DEV=true
 USE_TESTNET=true
 

apps/wallet-mobile/android/app/build.gradle

@@ -110,8 +110,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 529
         versionName "4.13.0"
-        testBuildType System.getProperty('testBuildType', 'debug')
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     splits {
@@ -136,15 +134,13 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
         }
     }
 
@@ -185,29 +181,25 @@ android {
 }
 
 dependencies {
-
-    androidTestImplementation('com.wix:detox:+')
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
 
-   // implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
+    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
 
     // If your app supports Android versions before Ice Cream Sandwich (API level 14)
-    implementation('com.facebook.fresco:animated-base-support:1.3.0')
+    implementation 'com.facebook.fresco:animated-base-support:1.3.0'
 
     // For animated GIF support
-    implementation ('com.facebook.fresco:animated-gif:2.5.0')
+    implementation 'com.facebook.fresco:animated-gif:2.5.0'
 
     // For WebP support, including animated WebP
-    implementation ('com.facebook.fresco:animated-webp:2.5.0')
+    implementation 'com.facebook.fresco:animated-webp:2.5.0'
     implementation 'com.facebook.fresco:webpsupport:2.5.0'
 
     // For WebP support, without animations
-    implementation ('com.facebook.fresco:webpsupport:2.5.0')
+    implementation 'com.facebook.fresco:webpsupport:2.5.0'
 
     // react-native-bootsplash
     implementation("androidx.core:core-splashscreen:1.0.0")
@@ -223,11 +215,6 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-
-}
-
-configurations.implementation {
-exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
 }
 
 apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

apps/wallet-mobile/android/app/src/main/AndroidManifest.xml

@@ -24,8 +24,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/BootTheme"
-      android:networkSecurityConfig="@xml/network_security_config">
+      android:theme="@style/BootTheme">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

apps/wallet-mobile/android/build.gradle

@@ -19,61 +19,19 @@ buildscript {
         maven {
             url 'https://www.jitpack.io'
         }
-
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.3.1"
         classpath "com.facebook.react:react-native-gradle-plugin"
         classpath "org.mozilla.rust-android-gradle:plugin:0.9.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
     }
 }
 
-
 allprojects {
-
     repositories {
-
-        mavenLocal()
-        google()
-        jcenter()
-        maven {
-            // 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")
-        }
-        maven {
-            // All of Detox' artifacts are provided via the npm module
-           url("$rootDir/../../../node_modules/detox/Detox-android")
-        }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-        // react-native-ble-plx setup
-        // https://github.com/Polidea/react-native-ble-plx (@2.0.0)
-        maven { url 'https://jitpack.io' }
-
         maven {
             // expo-camera bundles a custom com.google.android:cameraview
             url "$rootDir/../../../node_modules/expo-camera/android/maven"
         }
     }
-
-    afterEvaluate {
-        if (it.hasProperty('android')){
-            android {
-                defaultConfig {
-                    minSdkVersion rootProject.ext.minSdkVersion // Replace '21' with whatever suites your case
-                }
-            }
-        }
-    }
 }

apps/wallet-mobile/android/gradle.properties

@@ -44,7 +44,4 @@ newArchEnabled=false
 hermesEnabled=true
 
 # Increases the sql lite limit default 6MB
-AsyncStorage_db_size_in_MB=32
-
-#avoid adding the stdlib by default
-kotlin.stdlib.default.dependency=false
+AsyncStorage_db_size_in_MB=32

crowdin-wallet-mobile.yml → apps/wallet-mobile/crowdin.yml

@@ -1,7 +1,7 @@
 preserve_hierarchy: true
 files:
-  - source: /apps/wallet-mobile/src/i18n/locales/**/en-US.json
-    translation: /apps/wallet-mobile/src/i18n/locales/**/%locale%.json
+  - source: /src/i18n/locales/**/en-US.json
+    translation: /src/i18n/locales/**/%locale%.json
     languages_mapping:
       locale:
         zh-CN: zh-Hans
@@ -17,8 +17,8 @@ files:
         it: it-IT
         nl: nl-NL
         cz: cs-CZ
-  - source: /apps/wallet-mobile/src/i18n/locales/**/en-US.md
-    translation: /apps/wallet-mobile/src/i18n/locales/**/%locale%.md
+  - source: /src/i18n/locales/**/en-US.md
+    translation: /src/i18n/locales/**/%locale%.md
     languages_mapping:
       locale:
         zh-CN: zh-Hans

apps/wallet-mobile/e2e/config.json

@@ -0,0 +1,10 @@
+{
+  "setupFilesAfterEnv": ["./init.js"],
+  "maxWorkers": 1,
+  "testEnvironment": "./environment",
+  "testRunner": "jest-circus/runner",
+  "testTimeout": 120000,
+  "testRegex": "\\.e2e\\.js$",
+  "reporters": ["detox/runners/jest/streamlineReporter"],
+  "verbose": true
+}