Xaman up to 4.2.1

.detoxrc.js

@@ -15,7 +15,7 @@ module.exports = {
         'ios.simulator': {
             type: 'ios.simulator',
             headless: process.env.CI ? true : undefined,
-            device: { type: 'iPhone 15 Pro' },
+            device: { type: 'iPhone 16 Pro' },
         },
         'android.emulator': {
             type: 'android.apk',

.github/actions/prepare-env/action.yml

@@ -13,7 +13,7 @@ runs:
     - name: Node
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
 
     - name: Cache node_modules/
       uses: actions/cache@v4

.github/workflows/ios.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: [ self-hosted, macOS, ARM64 ]
     strategy:
       matrix:
-        ios: [ 17.4 ]
+        ios: [ 18.3.1 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,10 +29,17 @@ jobs:
       - name: Run tests
         working-directory: ios
         run: |
-          xcodebuild -quiet -workspace Xaman.xcworkspace -scheme Xaman -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=${{ matrix.ios }}' -resultBundlePath TestResults test
-
+          xcodebuild -quiet -workspace Xaman.xcworkspace -scheme Xaman -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=${{ matrix.ios }}' -resultBundlePath TestResults.xcresult test
+          echo "Exit code: $?"
+
+      - name: Check for xcresult
+        working-directory: ios
+        run: |
+          ls -la
+          if [ -d "TestResults.xcresult" ]; then echo "Found TestResults.xcresult"; else echo "TestResults.xcresult not found"; fi
+
       - name: Test Summary
-        uses: kishikawakatsumi/xcresulttool@v1
+        uses: slidoapp/xcresulttool@v3.1.0
         with:
           path: ios/TestResults.xcresult
         if: success() || failure()

.gitignore

@@ -75,3 +75,9 @@ e2e/artifacts/*
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
+
+# Imageprepare scripts
+scripts/imageprepare-app/*.svg
+scripts/imageprepare-app/*.png
+scripts/imageprepare-app/*/*
+android/app/libs/*.aar

LICENSE

@@ -2,9 +2,11 @@ CUSTOM (dual) License (!)
 
 Copyright (c) 2019 The Integrators B.V. (XRPL Labs)
 
-> If in doubt about / questions regarding Xumm licenses: please contact XRPL Labs: w@xrpl-labs.com
+> If in doubt about / questions regarding Xaman (formerly Xumm) licenses:
+  please contact XRPL Labs: w@xrpl-labs.com
 
 # For public / commercial / beta use
+
 ### Eg. XRPL forks, public projects, etc.
 
 Permission required by XRPL Labs (The Integrators BV (NL)). 

Makefile

@@ -3,7 +3,7 @@
 
 OS := $(shell sh -c 'uname -s 2>/dev/null')
 VARIANT ?= Debug
-SIMULATOR ?= iPhone 15 Pro Max
+SIMULATOR ?= iPhone 16 Pro Max
 DETOX_CONFIGURATION ?= ios.simulator+xaman.ios
 
 # Function definitions ============================
@@ -118,12 +118,15 @@ build-android: | stop .pre-run .pre-android ## Build the Android app
 test: | .pre-run
 	@npm run test
 
-test-e2e: | .pre-run ## Runs e2e tests
+test-e2e:  ## Runs e2e tests
 	@npx detox clean-framework-cache;
 	@npx detox build-framework-cache;
-	@npx detox build e2e --configuration ${DETOX_CONFIGURATION} --if-missing;
+	@npx detox build e2e --configuration ${DETOX_CONFIGURATION};
 	@npx cucumber-js ./e2e test;
 
+retest-e2e:  ## Runs e2e tests
+	@DETOX_LOGLEVEL=trace DETOX_REUSE=yes npx cucumber-js ./e2e test;
+
 bump-build-number: ## Bump build number for Android and iOS
 	@./scripts/bump-build-number.sh;
 

Xaman.xctestplan

@@ -0,0 +1,28 @@
+{
+  "configurations" : [
+    {
+      "id" : "2E1A5BBE-F248-49BB-8B0E-F17B20BBA391",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:Xaman.xcodeproj",
+      "identifier" : "13B07F861A680F5B00A75B9A",
+      "name" : "Xaman"
+    }
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Xaman.xcodeproj",
+        "identifier" : "00E356ED1AD99517003FC87E",
+        "name" : "XamanTests"
+      }
+    }
+  ],
+  "version" : 1
+}

android/app/build.gradle

@@ -3,11 +3,12 @@ apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply plugin: 'com.google.gms.google-services'
 apply plugin: "com.google.firebase.crashlytics"
+// apply plugin: 'com.google.android.gms.strict-version-matcher-plugin
 
 import com.android.build.OutputFile
 
-def canonicalVersionName = "3.2.0"
-def canonicalVersionCode = 34
+def canonicalVersionName = "4.2.1"
+def canonicalVersionCode = 123
 
 // NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android
 def postFixSize = 30_000
@@ -123,11 +124,22 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
+    bundle {
+        language {
+            enableSplit = true
+        }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
+        }
+    }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
+            universalApk true  // If true, also generate a universal APK
             include(*reactNativeArchitectures())
         }
     }
@@ -191,42 +203,130 @@ android {
 
         }
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = false
+        }
+    }
 }
 
 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    // For animated GIF support
-    implementation 'com.facebook.fresco:animated-gif:2.0.0'
-
+    // Use local React Native AAR files instead of the prebuilt ones
+    debugImplementation files('libs/ReactAndroid-debug.aar')
+    releaseImplementation files('libs/ReactAndroid-release.aar')
+
+    // React Native Core Dependencies (that your AAR might be missing)
+    implementation 'com.facebook.fbjni:fbjni:0.5.1'
+    implementation 'com.facebook.soloader:soloader:0.10.5'
+    implementation 'com.facebook.yoga:proguard-annotations:1.19.0'
+
+    // Complete OkHttp3 dependency set
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    implementation 'com.squareup.okio:okio:3.6.0'
+    implementation 'com.squareup.okhttp3:okhttp-tls:4.12.0'
+
+    // Fresco dependencies
+    implementation 'com.facebook.fresco:fresco:3.1.3'
+    implementation 'com.facebook.fresco:drawee:3.1.3'
+    implementation 'com.facebook.fresco:imagepipeline:3.1.3'
+    implementation 'com.facebook.fresco:fbcore:3.1.3'
+    implementation('com.facebook.fresco:animated-gif:3.1.3') {
+        exclude group: 'com.facebook.react', module: 'react-android'
+    }
+
+    // Additional Fresco backends that might be needed
+    implementation 'com.facebook.fresco:imagepipeline-okhttp3:3.1.3'
+    implementation 'com.facebook.fresco:memory-type-ashmem:3.1.3'
+    implementation 'com.facebook.fresco:memory-type-native:3.1.3'
+    implementation 'com.facebook.fresco:memory-type-java:3.1.3'
+
+    // Jackson JSON processing (React Native uses this heavily)
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.13.4'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.4'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4'
+
+    // JSR-305 annotations for @Nullable, @Nonnull, etc.
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+
+    // Facebook Infer annotations 
+    implementation 'com.facebook.infer.annotation:infer-annotation:0.18.0'
+
+    // AndroidX annotations
+    implementation 'androidx.annotation:annotation:1.7.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core:1.12.0'
+    implementation 'androidx.fragment:fragment:1.6.2'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+
+    // Hermes/JSC (uncomment the one you're using)
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
-
-    // firebase + messaging
+
+    // Additional React Native related dependencies
+    implementation 'javax.inject:javax.inject:1'
+
+    // For React Native's AsyncStorage (if you use it)
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+
+    // For React Native's networking capabilities
+    implementation 'androidx.webkit:webkit:1.11.0'
+
+    // Your existing app-specific dependencies
     implementation 'com.google.firebase:firebase-messaging:+'
-    // biometric authentication
+    implementation 'com.google.firebase:firebase-common-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'
+
     implementation "androidx.biometric:biometric:1.1.0"
-    // qrcode generate
     implementation 'com.github.kenglxn.QRGen:android:2.6.0'
-    // blur view
-    implementation 'com.github.Dimezis:BlurView:version-2.0.2'
-    // WebView
-    implementation 'androidx.webkit:webkit:1.11.0'
-    // inApp purchase
+    implementation 'com.github.Dimezis:BlurView:version-2.0.6'
     implementation 'com.android.billingclient:billing:7.0.0'
     implementation 'com.google.android.gms:play-services-wallet:19.4.0'
-    // inApp update
     implementation 'com.google.android.play:app-update:2.1.0'
-    // Other
     implementation 'com.google.android.gms:play-services-base:18.4.0'
     implementation 'com.google.android.material:material:1.12.0'
+
+    // ML Kit dependencies for react-native-camera
+    // Object detection feature with bundled default classifier
+    // implementation 'com.google.mlkit:barcode-scanning:17.3.0'
+    // implementation 'com.google.mlkit:object-detection:17.0.2'
+
+    // Object detection feature with custom classifier support
+    // implementation 'com.google.mlkit:object-detection-custom:17.0.2'
+
+    // Face features
+    // implementation 'com.google.mlkit:face-detection:16.1.7'
+
+    implementation 'com.google.mlkit:common:18.7.0'
+    implementation 'com.google.mlkit:barcode-scanning:17.1.0'
+    implementation 'com.google.mlkit:vision-common:17.3.0'
 
-    // only for running tests
+    /// implementation 'com.google.mlkit:barcode-scanning:17.2.0'
+    implementation 'com.google.mlkit:text-recognition:16.0.0'
+
+    implementation 'com.google.mlkit:barcode-scanning-common:17.0.0'
+    implementation 'com.google.mlkit:text-recognition:16.0.0'
+    implementation 'com.google.mlkit:face-detection:16.1.5'
+
+    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
+    // implementation 'com.google.mlkit:image-labeling:17.0.7'
+
+    // Older coroutines so Tangem SDK works
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+
+    // Test dependencies
     androidTestImplementation 'com.wix:detox:+'
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+// Exclude React Native from all configurations to avoid conflicts with local AAR
+configurations.all {
+    exclude group: 'com.facebook.react', module: 'react-android'
+}