4.0.0

.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,8 @@ 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/*/*

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

@@ -6,8 +6,8 @@ apply plugin: "com.google.firebase.crashlytics"
 
 import com.android.build.OutputFile
 
-def canonicalVersionName = "3.2.0"
-def canonicalVersionCode = 34
+def canonicalVersionName = "4.0.0"
+def canonicalVersionCode = 85
 
 // NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android
 def postFixSize = 30_000
@@ -123,11 +123,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())
         }
     }
@@ -213,7 +224,7 @@ dependencies {
     // qrcode generate
     implementation 'com.github.kenglxn.QRGen:android:2.6.0'
     // blur view
-    implementation 'com.github.Dimezis:BlurView:version-2.0.2'
+    implementation 'com.github.Dimezis:BlurView:version-2.0.6'
     // WebView
     implementation 'androidx.webkit:webkit:1.11.0'
     // inApp purchase

android/app/src/main/res/layout/activity_splash.xml

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:background="@color/splash_screen_background"
     >
   <ImageView
@@ -14,11 +15,13 @@
       android:scaleType="centerCrop"
       android:src="@drawable/splash_screen_patterns" />
 
-  <ImageView
-      android:layout_width="200dp"
-      android:layout_height="200dp"
-      android:layout_centerInParent="true"
-      android:contentDescription="@string/splash_screen_foreground"
-      android:scaleType="fitCenter"
-      android:src="@drawable/formerly_logo" />
+    <ImageView
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="50dp"
+        android:contentDescription="@string/splash_screen_foreground"
+        android:scaleType="fitCenter"
+        android:src="@drawable/formerly_logo" />
 </RelativeLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,6 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <!-- <background android:drawable="@android:color/transparent"/> -->
+    <!-- <foreground android:drawable="@android:color/transparent"/> -->
 </adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="splash_screen_background" type="color">#FFFFFF</item>
+    <item name="splash_screen_background" type="color">#1129C1</item>
     <item name="push_notification" type="color">#4494D3</item>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -5,11 +5,17 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:textColor">#000000</item>
+        <item name="android:windowBackground">#1129C1</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <!-- <item name="android:navigationBarColor">@android:color/transparent</item> -->
+        <item name="android:navigationBarColor">#1129C1</item>
+        <item name="android:statusBarColor">#1129C1</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:fitsSystemWindows">false</item>
     </style>
 
-
     <!-- General theme for the ActionSheet -->
     <style name="DialogListItemStyle">
         <item name="android:layout_width">match_parent</item>

android/build.gradle

@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 import groovy.json.JsonSlurper
 
-
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
@@ -44,7 +43,6 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
         maven { url "https://cdn.veriff.me/android/" } // veriff
-
     }
 }
 

e2e/01_setup.feature

@@ -1,8 +1,8 @@
 Feature: Setup App
     Scenario: Show onboarding
         Given I should have 'onboarding-screen'
-        Given I should see 'slider-start-button'
-        Then I tap 'slider-start-button'
+        Given I should see 'start-button'
+        Then I tap 'start-button'
 
     Scenario: Setup passcode
         Given I should have 'setup-passcode-screen'
@@ -11,12 +11,13 @@ Feature: Setup App
         Given I should see 'pin-code-entry-view'
         Then I type my passcode
         Then I tap 'next-button'
+#        Then I tap alert button with label 'Use anyway'
         Then I type my passcode
         Then I tap 'next-button'
 
     Scenario: Finish setup
-        Given I should wait 5 sec to see 'agreement-setup-screen'
-        Then I wait 5 sec for button 'confirm-button' to be enabled
+        Given I should wait 4 sec to see 'agreement-setup-screen'
+        Then I wait 4 sec for button 'confirm-button' to be enabled
         Then I tap 'confirm-button'
 
     Scenario: After setup

e2e/02_generate_account.feature

@@ -14,7 +14,7 @@ Feature: Generate Account
         Then I tap 'next-button'
         Given I should have 'account-generate-confirm-private-view'
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-generate-show-address-view'
         Then I read my account address
         Then I tap 'next-button'
@@ -73,7 +73,7 @@ Feature: Generate Account
         Then I tap 'next-button'
         Given I should have 'account-generate-confirm-private-view'
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-generate-show-address-view'
         Then I read my account address
         Then I tap 'next-button'

e2e/03_import_account.feature

@@ -14,7 +14,7 @@ Feature: Import Account
         Then I tap 'next-button'
         Then I generate new secret number
         Then I enter my secret number
-        Then I tap 'next-button'
+#        Then I tap 'next-button'
         Given I should have 'account-import-show-address-view'
         Then I read my account address
         Then I tap 'next-button'
@@ -27,7 +27,7 @@ Feature: Import Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Then I tap 'tab-Home'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 

e2e/04_upgrade_account.feature

@@ -19,7 +19,7 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Then I tap 'tab-Home'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
@@ -44,8 +44,8 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Given I should have 'settings-tab-screen'
-        Then I tap 'tab-Home'
+#        Given I should have 'settings-tab-screen'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 
@@ -101,8 +101,8 @@ Feature: Upgrade Account
         Then I tap 'next-button'
         Given I should have 'account-import-finish-view'
         Then I tap 'finish-button'
-        Given I should have 'settings-tab-screen'
-        Then I tap 'tab-Home'
+#        Given I should have 'settings-tab-screen'
+#        Then I tap 'tab-Home'
         Given I should have 'home-tab-view'
         Given I should see same account address
 

e2e/step_definitions/account.js

@@ -32,32 +32,10 @@ Then('I generate new secret number', async () => {
 
 Then('I enter my secret number', { timeout: 5 * 60 * 1000 }, async () => {
     for (let r = 0; r < 8; r++) {
-        // get values for any column
         for (let c = 0; c < 6; c++) {
-            const attributes = await element(by.id(`${r}.${c}`)).getAttributes();
-            const value = attributes.text;
-
-            let diff = Number(value) - Number(this.numbers[r][c]);
-
-            let pos = true;
-
-            if (diff < 0) {
-                pos = false;
-            }
-
-            diff = Math.abs(diff);
-
-            for (let t = 0; t < diff; t++) {
-                if (pos) {
-                    await element(by.id('minus-btn')).tap();
-                } else {
-                    await element(by.id('plus-btn')).tap();
-                }
-            }
-
-            await element(by.id('right-btn')).tap();
-        }
-    }
+            await element(by.id(`${this.numbers[r][c]}-key`)).tap();
+        };
+    };
 });
 
 Then('I read my account address', async () => {
@@ -82,15 +60,15 @@ Then('I generate testnet account', async () => {
 });
 
 Then('I enter the address in the input', async () => {
-    await element(by.id('address-input')).typeText(this.address);
+    await element(by.id('address-input')).typeText(`${this.address}\n`);
 });
 
 Then('I generate new family seed', async () => {
     this.seed = generateFamilySeed();
 });
 
 Then('I enter my seed in the input', async () => {
-    await element(by.id('seed-input')).typeText(this.seed);
+    await element(by.id('seed-input')).typeText(`${this.seed}\n`);
 });
 
 Then('I generate new mnemonic', async () => {