WIP 2

WIP: Testing alias from status-go
e2e: added wallet tests for send and swap flows on mainnet
2025-01-30 10:16:29 -06:00 · 2025-01-29 21:17:14 -06:00 · 2025-01-29 18:32:03 +02:00 · 2025-01-29 19:25:34 +05:30 · 2025-01-28 17:33:34 +02:00 · 2025-01-27 18:14:27 +05:30
258 changed files with 3738 additions and 2576 deletions
@@ -1,39 +1,26 @@
-[comment]: # (Please replace ... with your information. Remove < and >)
 [comment]: # (To auto-close issue on merge, please insert the related issue number after # i.e fixes #566)
-
-If you submit PR for issue with bounty then write here Fixes #NN where NN is issue number
-
-*otherwise*
-
 fixes #...

-### Summary
-
+## Summary
 [comment]: # (Summarise the problem and how the pull request solves it)
 ...

-<!-- (Optional, remove if no changes to documentation) -->
-Documentation change PR (review please): https://github.com/status-im/status.im/pull/xxx
+## Review notes
+[comment]: # (Optional. Specify if something in particular should be looked at, or ignored, during review)

-### Review notes
-<!-- (Optional. Specify if something in particular should be looked at, or ignored, during review) -->
+## Testing notes
+[comment]: # (Optional)

-### Testing notes
-<!-- (Optional) -->
-
-#### Platforms
-<!-- (Optional. Specify which platforms should be tested) -->
+### Platforms
+[comment]: # (Optional. Specify which platforms should be tested)

 - Android
 - iOS
- macOS
- Linux
- Windows

-#### Areas that maybe impacted
-<!-- (Optional. Specify if some specific areas has to be tested, for example 1-1 chats) -->
+### Areas that may be impacted
+[comment]: # (Optional. Specify if some specific areas need to be tested, such as 1-1 chats)

-##### Functional
+#### Functional

 - 1-1 chats
 - public chats
@@ -48,32 +35,27 @@ Documentation change PR (review please): https://github.com/status-im/status.im/
 - fleet
 - bootnodes

-##### Non-functional
+#### Non-functional

 - battery performance
 - CPU performance / speed of the app
 - network consumption

-### Steps to test
-<!-- (Specify exact steps to test if there are such) -->
+## Steps to test
+[comment]: #  (Specify exact steps to test if there are such)

 - Open Status
 - ...
 - Step 3, etc.

-<!-- (PRs will only be accepted if squashed into single commit.) -->

-### Before and after screenshots comparison
+[comment]: # (Can be ready or wip)
+status: ready

-| Figma (if available) | iOS (if available)    | Android (if available)
-| --- | --- | --- |
-| Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after. |
-
-status: ready <!-- Can be ready or wip -->

 <!-- Uncomment this section for status-go upgrade/dogfooding pull requests

- Specify potentially impacted user flows in _Areas that maybe impacted*.
+- Specify potentially impacted user flows in _Areas that may be impacted*.
 - Ensure that _Steps to test_ is filled in.

 ### Risk
@@ -43,8 +43,6 @@ export NODE_OPTIONS += --openssl-legacy-provider
 # The path can be anything, but home is usually safest.
 export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore

-# Our custom config is located in nix/nix.conf
-export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
 # Location of symlinks to derivations that should not be garbage collected
 export _NIX_GCROOTS = ./.nix-gcroots
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
@@ -269,9 +267,11 @@ run-metro: export TARGET := clojure
 run-metro: ##@run Start Metro to build React Native changes
 	@scripts/run-metro.sh

+export RE_FRISK_PORT ?= 4567
+
 run-re-frisk: export TARGET := clojure
 run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
+	yarn shadow-cljs run re-frisk-remote.core/start ${RE_FRISK_PORT}

 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
@@ -445,7 +445,7 @@ android-ports: export RCT_METRO_PORT ?= 8081
 android-ports: ##@other Add proxies to Android Device/Simulator
 	adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
 	adb reverse tcp:3449 tcp:3449 && \
-	adb reverse tcp:4567 tcp:4567 && \
+	adb reverse tcp:$(RE_FRISK_PORT) tcp:$(RE_FRISK_PORT) && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
 	adb forward tcp:5561 tcp:5561

@@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'linux && x86_64 && nix-2.19' }
+  agent { label 'linux && x86_64 && nix-2.24' }

  options {
    timestamps()
@@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'macos && arm64 && nix-2.19 && xcode-15.1' }
+  agent { label 'macos && arm64 && nix-2.24 && xcode-16.2' }

  parameters {
    string(
@@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.13'
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'linux && x86_64 && nix-2.19' }
+  agent { label 'linux && x86_64 && nix-2.24' }

  options {
    timestamps()
@@ -16,6 +16,7 @@
 - [Patching](patching.md)
 - [Creating a pixel perfect UI](pixel-perfection.md)
 - [Contributing to status-go](status-go-changes.md)
+- [Status Backend Server](use-status-backend-server.md)
 - [Malli schemas (recorded demo)](https://www.youtube.com/watch?v=SlRio70aYVI) ([slides](files/forging-code-with-schemas-sep-2023-slides.pdf))

 ## Testing
@@ -1 +1 @@
-Status: محفظة تشفير اجتماعية
+Status: محفظة إيثريوم كريبتو
@@ -1 +1 @@
-Status: Social Crypto Wallet
+Status: Ethereum Crypto Wallet
@@ -1 +1 @@
-Status: Billetera social cripto
+Status: Billetera Ethereum
@@ -1 +1 @@
-Status : Portef. crypto social
+Status: Portefeuille Ethereum
@@ -1 +1 @@
-Status: ソーシャル クリプト ウォレット
+Status: イーサリアム クリプト ウォレット
@@ -1 +1 @@
-Status: 소셜 크립토 지갑
+Status: 이더리움 크립토 지갑
@@ -1 +1 @@
-Status: Carteira social cripto
+Status: Carteira Ethereum
@@ -1 +1 @@
-Status: Криптокошелек
+Status: Ethereum Криптокошелек
@@ -1 +1 @@
-Status:  Sosyal Kripto Cüzdanı
+Status Ethereum Kripto Cüzdanı
@@ -1 +1 @@
-Status: Криптогаманець
+Status Ethereum Криптогаманець
@@ -1 +1 @@
-Status: 可以社交的加密货币钱包
+Status: 以太坊加密钱包
@@ -23,15 +23,18 @@ PODS:
    - secp256k1
    - SSZipArchive
  - libevent (2.1.12)
-  - libwebp (1.2.4):
-    - libwebp/demux (= 1.2.4)
-    - libwebp/mux (= 1.2.4)
-    - libwebp/webp (= 1.2.4)
-  - libwebp/demux (1.2.4):
+  - libwebp (1.3.2):
+    - libwebp/demux (= 1.3.2)
+    - libwebp/mux (= 1.3.2)
+    - libwebp/sharpyuv (= 1.3.2)
+    - libwebp/webp (= 1.3.2)
+  - libwebp/demux (1.3.2):
    - libwebp/webp
-  - libwebp/mux (1.2.4):
+  - libwebp/mux (1.3.2):
    - libwebp/demux
-  - libwebp/webp (1.2.4)
+  - libwebp/sharpyuv (1.3.2)
+  - libwebp/webp (1.3.2):
+    - libwebp/sharpyuv
  - RCT-Folly (2022.05.16.00):
    - boost
    - DoubleConversion
@@ -1152,15 +1155,15 @@ PODS:
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - RNImageCropPicker (0.40.0):
+  - RNImageCropPicker (0.41.2):
    - React-Core
    - React-RCTImage
-    - RNImageCropPicker/QBImagePickerController (= 0.40.0)
-    - TOCropViewController
-  - RNImageCropPicker/QBImagePickerController (0.40.0):
+    - RNImageCropPicker/QBImagePickerController (= 0.41.2)
+    - TOCropViewController (~> 2.7.4)
+  - RNImageCropPicker/QBImagePickerController (0.41.2):
    - React-Core
    - React-RCTImage
-    - TOCropViewController
+    - TOCropViewController (~> 2.7.4)
  - RNKeychain (8.1.2):
    - React-Core
  - RNLinearGradient (3.0.0-alpha.1):
@@ -1189,7 +1192,7 @@ PODS:
  - secp256k1 (0.1.6)
  - SocketRocket (0.6.1)
  - SSZipArchive (2.4.3)
-  - TOCropViewController (2.6.1)
+  - TOCropViewController (2.7.4)
  - Yoga (1.14.0)

 DEPENDENCIES:
@@ -1489,7 +1492,7 @@ CHECKOUT OPTIONS:
    :git: https://github.com/status-im/Keycard.swift.git
    :tag: 3.1.1
  secp256k1:
-    :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
+    :commit: 4ab977cc2b2d7319be858bcb30a5d189bb149884
    :git: https://github.com/status-im/secp256k1.swift.git
    :submodules: true

@@ -1506,7 +1509,7 @@ SPEC CHECKSUMS:
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: 3bd24405b9a875b3b3cf1ab1be69b5c30c5f28bc
  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
  RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
  RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
  RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1577,7 +1580,7 @@ SPEC CHECKSUMS:
  RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
  RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
  RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
-  RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
+  RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f
  RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
  RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6
  RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
@@ -1590,9 +1593,9 @@ SPEC CHECKSUMS:
  secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
-  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
+  TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
  Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7

-PODFILE CHECKSUM: 81a66b45adddb083171ade882c343deb4faf2a8b
+PODFILE CHECKSUM: 56d9f695324306d6db368d1172d211dfab55b7cb

 COCOAPODS: 1.15.2
@@ -572,6 +572,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -579,6 +580,7 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -614,6 +616,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -621,6 +624,7 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -728,6 +732,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
@@ -735,6 +740,7 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
@@ -203,24 +203,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        )
    }

-    @ReactMethod
-    fun verify(address: String, password: String, callback: Callback) {
-        val absRootDirPath = utils.getNoBackupDirectory()
-        val newKeystoreDir = utils.pathCombine(absRootDirPath, "keystore")
-
-        val jsonParams = JSONObject()
-        jsonParams.put("keyStoreDir", newKeystoreDir)
-        jsonParams.put("address", address) 
-        jsonParams.put("password", password)
-
-        StatusBackendClient.executeStatusGoRequestWithCallback(
-            endpoint = "VerifyAccountPasswordV2",
-            requestBody = jsonParams.toString(),
-            statusgoFunction = { Statusgo.verifyAccountPasswordV2(jsonParams.toString()) },
-            callback
-        )
-    }
-
    @ReactMethod
    fun verifyDatabasePassword(keyUID: String, password: String, callback: Callback) {
        val jsonParams = JSONObject()
@@ -87,42 +87,6 @@ class EncryptionUtils(private val reactContext: ReactApplicationContext) : React
        )
    }

-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun encodeTransfer(to: String, value: String): String? {
-        return try {
-            val params = JSONObject().apply {
-                put("to", to)
-                put("value", value)
-            }
-            StatusBackendClient.executeStatusGoRequestWithResult(
-                "EncodeTransferV2",
-                params.toString(),
-                { Statusgo.encodeTransferV2(params.toString()) }
-            )
-        } catch (e: JSONException) {
-            Log.e(TAG, "Error creating JSON for encodeTransfer: ${e.message}")
-            null
-        }
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun encodeFunctionCall(method: String, paramsJSON: String): String? {
-        return try {
-            val params = JSONObject().apply {
-                put("method", method)
-                put("paramsJSON", JSONObject(paramsJSON))
-            }
-            StatusBackendClient.executeStatusGoRequestWithResult(
-                "EncodeFunctionCallV2",
-                params.toString(),
-                { Statusgo.encodeFunctionCallV2(params.toString()) }
-            )
-        } catch (e: JSONException) {
-            Log.e(TAG, "Error creating JSON for encodeFunctionCall: ${e.message}")
-            null
-        }
-    }
-
    @ReactMethod(isBlockingSynchronousMethod = true)
    fun decodeParameters(decodeParamJSON: String): String = 
        StatusBackendClient.executeStatusGoRequestWithResult(
@@ -195,36 +195,6 @@ RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
    }];
 }

-RCT_EXPORT_METHOD(verify:(NSString *)address
-        password:(NSString *)password
-        callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"VerifyAccountPasswordV2() method called");
-#endif
-    NSURL *rootUrl = [Utils getRootUrl];
-    NSString *keystorePath = [rootUrl.path stringByAppendingPathComponent:@"keystore"];
-    
-    NSDictionary *params = @{
-        @"keyStoreDir": keystorePath,
-        @"address": address,
-        @"password": password
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", error);
-        return;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    [StatusBackendClient executeStatusGoRequestWithCallback:@"VerifyAccountPasswordV2"
-                                                     body:jsonString
-                                        statusgoFunction:^NSString *{
-        return StatusgoVerifyAccountPasswordV2(jsonString);
-    }
-                                                 callback:callback];
-}
-
 RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
        password:(NSString *)password
        callback:(RCTResponseSenderBlock)callback) {
@@ -105,48 +105,6 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
                                                 callback:callback];
 }

-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
-                                     value:(NSString *)value) {
-    NSDictionary *params = @{
-        @"to": to,
-        @"value": value
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return nil;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"EncodeTransferV2"
-                                                          body:jsonString
-                                              statusgoFunction:^NSString *{
-        return StatusgoEncodeTransferV2(jsonString);
-    }];
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeFunctionCall:(NSString *)method
-                                     paramsJSON:(NSString *)paramsJSON) {
-    NSDictionary *params = @{
-        @"method": method,
-        @"paramsJSON": paramsJSON
-    };
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
-    if (error) {
-        NSLog(@"Error creating JSON: %@", [error localizedDescription]);
-        return nil;
-    }
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    return [StatusBackendClient executeStatusGoRequestWithResult:@"EncodeFunctionCallV2"
-                                                          body:jsonString
-                                              statusgoFunction:^NSString *{
-        return StatusgoEncodeFunctionCallV2(jsonString);
-    }];
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(decodeParameters:(NSString *)decodeParamJSON) {
    return [StatusBackendClient executeStatusGoRequestWithResult:@"DecodeParameters"
                                                          body:decodeParamJSON
@@ -389,86 +389,6 @@ void _StopCPUProfiling(const FunctionCallbackInfo<Value>& args) {

 }

-void _EncodeTransfer(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 2) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for EncodeTransfer")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'to'")));
-		return;
-	}
-
-	if (!args[1]->IsString()) {
-    		isolate->ThrowException(Exception::TypeError(
-    			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'value'")));
-    		return;
-    	}
-
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-	String::Utf8Value arg1Obj(isolate, args[1]->ToString(context).ToLocalChecked());
-    char *arg1 = *arg1Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = EncodeTransfer(arg0, arg1);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-}
-
-void _EncodeFunctionCall(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 2) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for EncodeFunctionCall")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'method'")));
-		return;
-	}
-
-	if (!args[1]->IsString()) {
-    		isolate->ThrowException(Exception::TypeError(
-    			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'paramsJSON'")));
-    		return;
-    	}
-
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-	String::Utf8Value arg1Obj(isolate, args[1]->ToString(context).ToLocalChecked());
-    char *arg1 = *arg1Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = EncodeFunctionCall(arg0, arg1);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-}
-
 void _DecodeParameters(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1380,53 +1300,6 @@ void _CallPrivateRPC(const FunctionCallbackInfo<Value>& args) {

 }

-void _VerifyAccountPassword(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 3) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for VerifyAccountPassword")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'keyStoreDir'")));
-		return;
-	}
-	if (!args[1]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'address'")));
-		return;
-	}
-	if (!args[2]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'password'")));
-		return;
-	}
-
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-	String::Utf8Value arg1Obj(isolate, args[1]->ToString(context).ToLocalChecked());
-	char *arg1 = *arg1Obj;
-	String::Utf8Value arg2Obj(isolate, args[2]->ToString(context).ToLocalChecked());
-	char *arg2 = *arg2Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = VerifyAccountPassword(arg0, arg1, arg2);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-
-}
-
 void _SendTransactionWithSignature(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1992,8 +1865,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "acceptTerms", _AcceptTerms);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
-	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
-	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);
 	NODE_SET_METHOD(exports, "decodeParameters", _DecodeParameters);
 	NODE_SET_METHOD(exports, "hexToNumber", _HexToNumber);
 	NODE_SET_METHOD(exports, "numberToHex", _NumberToHex);
@@ -2017,7 +1888,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "openAccounts", _OpenAccounts);
 	NODE_SET_METHOD(exports, "extractGroupMembershipSignatures", _ExtractGroupMembershipSignatures);
 	NODE_SET_METHOD(exports, "callPrivateRPC", _CallPrivateRPC);
-	NODE_SET_METHOD(exports, "verifyAccountPassword", _VerifyAccountPassword);
 	NODE_SET_METHOD(exports, "sendTransactionWithSignature", _SendTransactionWithSignature);
 	NODE_SET_METHOD(exports, "writeHeapProfile", _WriteHeapProfile);
 	NODE_SET_METHOD(exports, "addPeer", _AddPeer);
@@ -51,7 +51,7 @@ in {
  yarn = super.yarn.override { nodejs = super.nodejs_20; };
  openjdk = super.openjdk17_headless;
  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    versions = ["15.1" "15.2" "15.3" "15.4"];
+    versions = ["16.0" "16.1" "16.2"];
  };
  go = super.go_1_21;
  clang = super.clang_15;
@@ -38,8 +38,8 @@ nix_install_type() {
            "${UID}")   echo "single";;
            "(${UID})") echo "single";;
            "")         echo "none";
-                        echo "No Nix installtion detected!" >&2;;
-            *)          echo "Unknown Nix installtion type!" >&2; exit 1;;
+                        echo "No Nix installation detected!" >&2;;
+            *)          echo "Unknown Nix installation type!" >&2; exit 1;;
        esac
    fi
 }
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-export NIX_VERSION="2.19.3"
-export NIX_PACKAGE="nixVersions.nix_2_19"
+export NIX_VERSION="2.24.11"
+export NIX_PACKAGE="nixVersions.nix_2_24"
 export NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-export NIX_INSTALL_SHA256="73d47b0ab783fddca1b2d44a03d52a74c97c28a1fc8ff5a29419079302ef9c3d"
+export NIX_INSTALL_SHA256="5c610a0e97c8a2dd48c1a630608502e43fdecd7d2572463dd4166126106d9188"
 export NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"
@@ -38,6 +38,9 @@ in mkShell {
  LANG="en_US.UTF-8";
  LANGUAGE="en_US.UTF-8";

+  # Important to load our own Nix binary cache.
+  NIX_CONFIG = builtins.readFile ./nix.conf;
+
  # just a nicety for easy access to node scripts
  shellHook = ''
    export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)
@@ -1,4 +1,4 @@
-{ callPackage, lib, buildGoPackage
+{ callPackage, lib, buildGoPackage, pkgs
 , androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , go-bindata, mockgen, protobuf3_20, protoc-gen-go
 , meta
@@ -15,6 +15,8 @@ let
  isIOS = platform == "ios";
  isAndroid = platform == "android";
  enforceXCodeAvailable = callPackage ./enforceXCodeAvailable.nix { };
+  # Fixes fatal: not a git repository (or any of the parent directories): .git
+  fakeGit = pkgs.writeScriptBin "git" "echo ${source.version}";

 in buildGoPackage rec {
  pname = source.repo;
@@ -29,7 +31,7 @@ in buildGoPackage rec {

  extraSrcPaths = [ gomobile ];
  nativeBuildInputs = [
-    gomobile removeReferencesTo go-bindata mockgen protoc-gen-go protobuf3_20
+    gomobile removeReferencesTo go-bindata mockgen protoc-gen-go protobuf3_20 fakeGit
  ] ++ optional isAndroid openjdk
    ++ optional isIOS xcodeWrapper;

@@ -51,7 +51,7 @@
    "react-native-get-random-values": "^1.11.0",
    "react-native-gifted-charts": "^1.3.2",
    "react-native-hole-view": "^3.0.0-alpha4",
-    "react-native-image-crop-picker": "0.40.0",
+    "react-native-image-crop-picker": "0.41.2",
    "react-native-image-resizer": "^1.2.3",
    "react-native-keychain": "8.1.2",
    "react-native-linear-gradient": "3.0.0-alpha.1",
@@ -66,7 +66,7 @@
    "react-native-shake": "^3.3.1",
    "react-native-share": "10.0.2",
    "react-native-static-safe-area-insets": "^2.2.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.4",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.5",
    "react-native-svg": "13.10.0",
    "react-native-webview": "13.6.3",
    "react-syntax-highlighter": "^15.5.0"
@@ -1,9 +1,10 @@
 Status Terms of Use

-Last updated: 14 August 2024
+Last updated: 10 December 2024

 1. Introduction

+
 1.1 Who we are

 Status is developing a set of open source projects that use peer-to-peer technologies to help people transact securely, communicate freely, and organise with confidence. Anyone participating in these projects helps to build technology and tools that empowers people to advance their own sovereign communities.
@@ -14,7 +15,7 @@ Status does not provide any services, such as financial services, to users of St

 1.2 About these terms

-These terms are a contract between you and Status and apply to your use of Status Software. The term “Status Software” as used herein means a software developed by Status and is composed of a secure messaging tool, a crypto wallet, and a Web 3 browser integrated together.
+These terms are a contract between you and Status and apply to your use of Status Software. The term “Status Software” as used herein means a software developed by Status and is composed of a secure messaging tool and a crypto wallet integrated together.

 Please read these terms carefully before using Status Software. By installing or using Status Software on any device, you agree to these terms. If you do not agree, you should not install or use Status Software.

@@ -48,57 +49,56 @@ If a dispute arises between you and Status, we will seek to first solve it amica

 At Status, we strive to develop open source software that can serve as a secure communication tool that helps to uphold human rights. Status Software is specifically designed to facilitate the free flow of information, protect the right to private, secure communications and promote the sovereignty of individuals.

-Status Software is composed of a secure messaging tool, a crypto wallet, and a Web 3 browser integrated together. The software developed by Status in this regard is simply called “Status Software” and you can find more details about its development on Status’ GitHub page.
+Status Software is composed of a secure messaging tool and a crypto wallet integrated together. The software developed by Status in this regard is simply called “Status Software” and you can find more details about its development on Status’ GitHub page.

 Status Software is open source client software that is designed to be user-friendly and can be installed or run in a web browser on your local desktop or mobile device. You can use Status Software to interact with and participate in Web 3 protocols, applications and peer to peer networks (referred to in these terms collectively, as “Web 3”). Please note that Status Software is not a blockchain protocol, or a blockchain network, a platform or a web-based platform.

-Status develops Status Software and makes it available for you to run in a web browser or for your local use on your desktop or mobile device. This means that you are solely responsible for your activity and any potential risk or loss you may incur through using the Status Software as further detailed below in these terms.
+Status develops Status Software and makes it available for you to run in a web browser or for your local use on your desktop or mobile device. This means that you are solely responsible for your activity and any potential risk or loss you may incur through using the Status Software as further detailed below in these terms. 
+
+As a result of the privacy-first design of Status Software:
+
+1. Status does not store nor have access to user data, messages, or content;
+2. Status cannot associate content or actions with individual users. However, users may choose to disclose certain limited information to Status voluntarily, such as when opting in to share usage analytics. This data, shared only through explicit consent of the user, is processed in accordance with our Privacy Policy;
+3. Status cannot block or ban users from using Status Software features;
+4. Status has no means of monitoring, moderating, removing, modifying or regulating users’ content or activity, except in Community Spaces created and directly managed by Status.

 2.1.1 Wallet

 Status Software includes a crypto wallet. We will refer to such wallet functionality in these terms as “Wallet”.

-The Wallet is your own personal crypto wallet. This type of wallet is sometimes also called “non-custodial”, “self-custodial” or “self-hosted”, which means you are in complete control of the crypto tokens (the “Digital Assets”) in the Wallet. Status will never have access to or control over your seed phrase, private keys or Digital Assets in your Wallet given its design.
+The Wallet is your own personal crypto wallet. This type of wallet is sometimes also called “non-custodial”, “self-custodial” or “self-hosted”, which means you are in complete control of the crypto tokens (the “Digital Assets”) in the Wallet. Status will never have access to or control over your seed phrase, private keys or Digital Assets in your Wallet given its design. 
+ 
+Using the Wallet, you are able to send, receive and store Digital Assets and connect to and interact with third-party services that enable the exchange of Digital Assets for fiat currency and Web 3, including certain blockchain bridges and decentralised exchanges. 

-Using the Wallet, you are able to send, receive and store Digital Assets and connect to and interact with third-party services that enable the exchange of Digital Assets for fiat currency and Web 3, including certain blockchain bridges and decentralised exchanges.
+The Wallet contains the latest security standards, anti-phishing mechanisms and locally generated and stored public and private keys to ensure that your Digital Assets are secured to the highest standards. 

-The Wallet contains the latest security standards, anti-phishing mechanisms and locally generated and stored public and private keys to ensure that your Digital Assets are secured to the highest standards.
+When generating an account, a randomisation process is started on your own device that generates a key pair. Status does not have visibility of or access to your private keys. You are solely responsible for storing and securing your seed phrase and private keys, and creating, storing and securing their backups. If you fail to maintain the appropriate security measures of your private keys, it may result in you losing access to your Wallet and control of any Digital Assets in your Wallet. If you lose or forget your seed phrase or private keys, Status will not be able to help you recover or replace them and further, Status will not be able to assist you with the recovery of your Digital Assets. 

-When generating an account, a randomisation process is started on your own device that generates a key pair. Status does not have visibility of or access to your private keys. You are solely responsible for storing and securing your seed phrase and private keys, and creating, storing and securing their backups. If you fail to maintain the appropriate security measures of your private keys, it may result in you losing access to your Wallet and control of any Digital Assets in your Wallet. If you lose or forget your seed phrase or private keys, Status will not be able to help you recover or replace them and further, Status will not be able to assist you with the recovery of your Digital Assets.
-
-In order to further enhance the security of storing your private keys, you may also choose to store your keys on a keycard, such as the Status Keycard.
+In order to further enhance the security of storing your private keys, you may also choose to store your keys on a keycard, such as the Status Keycard. 

 2.1.2 Messaging

-Status Software includes messaging functionality that enables secure communication between users. We will refer to the messaging functionality of Status Software and the Status Community Spaces collectively in these terms, as “Messaging”.
+Status Software includes messaging functionality that enables secure communication between users. We will refer to the messaging functionality of Status Software and the Community Spaces collectively in these terms, as “Messaging”.

-Messaging uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression to protect your messages from third parties (including Status). End-to-end encryption means that only the sender and recipient of a message can read its contents, and no one else. Peer-to-peer communication is accomplished using the Waku peer-to-peer messaging protocol, which relies on a distributed network of nodes instead of a centralised server. This means that there is no central party or server from which messages can be intercepted, modified or blocked. Learn more about Waku and how it works on Waku’s relevant website.
+Messaging uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression to protect your messages from third parties (including Status). End-to-end encryption means that only the sender and recipient of a message can read its contents, and no one else. Peer-to-peer communication is accomplished using the Waku peer-to-peer messaging protocol, which relies on a distributed network of nodes instead of a centralised server. This means that there is no central party or server from which messages can be intercepted, modified or blocked. Learn more about Waku and how it works on Waku’s relevant website. 

-Within Messaging, you will also be able to participate in Status Community Spaces. This feature allows users to create their own token-gated communities where you can create group chats and engage with your communities, while leveraging the possibilities, functionality and benefits of blockchain technology. You will also be able to create (and join) open and public communities on Status Software that are accessible to other users. We note that content in these open and public communities will be accessible to all other users of Status Software. Nonetheless, all content will still be protected by the same end-to-end encryption utilised in Status Software.
+Within Messaging, you will also be able to participate in Community Spaces. This feature allows users to create and join communities with varying access and discoverability options, which may include token-gated communities, private communities and open and public communities,  where you can create group chats and engage with your communities. We note that content in all Community Spaces will be accessible to the members of those spaces. For open and public communities, content will be accessible to all other users of Status Software. Nonetheless, all content, regardless of the type of community, will still be protected by the same end-to-end encryption utilised in Status Software. 

-2.1.2 Web 3 browser
-
-Status Software also includes a Web 3 browser through which you may access and interact with Web 3, exchanges, marketplaces, games and more. We will refer to the Web 3 browser in these terms as the “Web 3 Browser”.


 3. Privacy

-Status uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression, which by design, means that Status (and any third party) is unable to and does not collect, store, own, control or have any visibility or means of access to your identity, Wallet, browsing information, any user private keys, Digital Assets, messages, content, history of interactions, user accounts or any other user information.
-
-Therefore, Status does not (and cannot) monetise any users’ data or content, such as messages or browser information and Status does not have any interest in doing so.
-
-Status however processes a limited amount of user data to ensure the technical operation of the Status Software, enhance its functionality, and improve the user experience. For more details on this limited process of user data, please refer to our Privacy Policy.
+Status processes a limited amount of user data to ensure the technical operation of the Status Software, enhance its functionality, and improve the user experience. For more details on this limited process of user data, please refer to our Privacy Policy.

 If you use third party services offered through Status Software, your privacy may not be protected and you will be subject to the privacy terms and conditions of such third parties. Please refer to our full terms regarding third party services below.



-
 4. Using third party services and interacting with Web 3

 When using Status Software, you may access or use third party products, services or tools (“Third Party Services”) and interact with Web 3. Status Software is only one means of interacting with these Third Party Services and Web 3 and you can independently utilise other means and tools to do so as well.

-Your interactions with Web 3 could include many aspects, such as interacting with smart contracts that reside on blockchain networks, for example to swap Digital Assets or use (crypto) bridges, or deploying your own smart contracts through Status Community Spaces. You may also interact with and participate in peer-to-peer networks which could vary in their level of decentralisation, ranging from more centralised networks controlled by a single party to networks governed by decentralised communities.
+Your interactions with Web 3 could include many aspects, such as interacting with smart contracts that reside on blockchain networks, for example to swap Digital Assets or use (crypto) bridges, or deploying your own smart contracts through Community Spaces. You may also interact with and participate in peer-to-peer networks which could vary in their level of decentralisation, ranging from more centralised networks controlled by a single party to networks governed by decentralised communities.

 When you use Third Party Services or interact with Web 3, you acknowledge that Status does not control or operate any Third Party Service or Web 3. These products, services, or tools are either controlled, operated, owned, or licensed by the third party providing them, or they may operate autonomously, independently of Status or any other party.

@@ -127,7 +127,7 @@ Although security is a top priority for us and many functions of Status Software

 7. Content

-At Status, we believe in the sovereignty of individuals and we stand for the cause of personal liberty. We aim to promote social, political, and economic freedoms through Status Software, which is built on the principles of the free flow of information and censorship resistance. Through Status Software, particularly when using Messenger and Status Community Spaces, you will be able to create and interact with various content. We consider content to include anything you (or any other user) create, post, distribute or exchange through Status Software (as well as any future functions that may be added to Status Software), whether its text, links, GIFs, emoji, photos or any other media formats.
+At Status, we believe in the sovereignty of individuals and we stand for the cause of personal liberty. We aim to promote social, political, and economic freedoms through Status Software, which is built on the principles of the free flow of information and censorship resistance. Through Status Software, particularly when using Messenger and Community Spaces, you will be able to create and interact with various content. We consider content to include anything you (or any other user) create, post, distribute or exchange through Status Software (as well as any future functions that may be added to Status Software), whether its text, links, GIFs, emoji, photos or any other media formats.

 You are solely responsible for any content that you create, post, distribute or submit, messages you exchange or any other activity you may engage in related to your content on or through Status Software and any harm or liability that may result from such content.

@@ -145,25 +145,35 @@ You acknowledge that Status has no means of monitoring, moderating, removing, mo

 8.1 Adherence to Status Principles

-One of Status’ goals is the widespread adoption of the decentralised web while also staying true to our Principles. These terms are designed to reflect our Principles, while providing important legal protections for Status and setting out guidelines and terms for the Status Software community of users. We ask that you use Status Software in a way that promotes and aligns with the Status Principles.
+One of Status’ goals is the widespread adoption of the decentralised web while also staying true to our Principles. These terms are designed to reflect our Principles, while providing important legal protections for Status and setting out guidelines and terms for the Status Software community of users. We ask that you use Status Software in a way that promotes and aligns with the Status Principles, and avoid actions that may harm or disrupt the community of users. 

-8.2 Limitation on certain uses of and acts in Status Software
+We strongly encourage users to act responsibly and ethically in their interactions and refrain from (i) inciting harm, violence or illegal activity, (ii) engaging in harassment, abuse or discrimination, and (iii) spreading false or misleading information.

-You shall not, nor try to, encourage or assist others using Status Software to:
-1. gain or try to gain unauthorised access to Status Software;
-2. interfere with or disrupt the integrity, safety, security, availability or performance of Status Software;
-3. generate accounts on Status Software through unauthorised means;
-4. install or transmit on or through Status Software, any viruses, worms, malware, Trojan horses, or other harmful or destructive code or content;
-5. use spam, data mining, or other unsolicited promotional methods, machine generated content, or unethical or unwanted commercial content;
-6. engage in phishing, spoofing, or similar fraudulent acts;
-7. knowingly spread misinformation or impersonate another person or legal entity;
-8. incite, commit or threaten, harm or engage in illegal or inappropriate conduct including stalking, bullying, harassment, intimidation or abuse another individual or group;
-9. engage in or organise child sexual exploitation of any kind;
-10. use Status Software, if you are subject to sanctions, or otherwise designated on a list of prohibited or restricted parties as maintained by, the United Nations, the European Union or any of its member states or the Singaporean, Swiss or US government, or intend to interact or transact with such parties;
-11. violate, misappropriate or infringe the rights of Status, other users of Status Software, or any other third parties in any way, including but not limited to privacy, publicity, intellectual property, confidentiality, property or other rights;
-12. engage in any activity through Status Software that may be in violation of applicable law, rules or regulations in your jurisdiction;
-13. interfere, disrupt, negatively affect, or inhibit other users from their use of Status Software; or
-14. engage in any attack, hack, denial-of-service attack, interference, or exploit of any smart contract in connection with use of Status Software.
+If you are a Community Space creator or admin, we encourage you to establish your own guidelines to foster healthy and respectful community environments for your members.
+
+8.2 Community Governance
+
+Community Spaces are self-sovereign environments managed independently by their creators and appointed admins. These users are solely responsible for:
+
+1. establishing and enforcing their own community guidelines;
+2. configuring access controls and permissions;
+3. managing community membership, including accepting or rejecting requests;
+4. moderating content and interactions within their community; and
+5. taking actions against community members who violate their community guidelines or behave disruptively, including the ability to exclude or ban members.
+
+By participating in Community Spaces, you acknowledge that community governance lies solely with community creators and their appointed admins. Status cannot monitor, moderate or intervene in community interactions or governance decisions within any Community Space, except in cases where a Community Space is created and directly managed by Status.
+
+8.3 Limitation on certain uses of and acts in Status Software
+
+You agree not to use Status Software, or attempt or assist others to use it, in a manner that:
+1. uses unauthorised methods to create or gain access to an account on Status Software;
+2. interferes with or disrupts the integrity, safety, security, availability or performance of Status Software;
+3. installs or transmits on or through Status Software, any viruses, worms, malware, Trojan horses, or other harmful or destructive code or content;
+4. use Status Software, if you are subject to sanctions, or otherwise designated on a list of prohibited or restricted parties as maintained by, the United Nations, the European Union or any of its member states or the Singaporean, Swiss or US government, or intend to interact or transact with such parties;
+5. violate, misappropriate or infringe the rights of Status, other users of Status Software, or any other third parties in any way, including but not limited to privacy, publicity, intellectual property, confidentiality, property or other rights;
+6. engage in any activity through Status Software that may be in violation of applicable law, rules or regulations in your jurisdiction;
+7. interfere, disrupt, negatively affect, or inhibit other users from their use of Status Software; or
+8. engage in any attack, hack, denial-of-service attack, interference, or exploit of any smart contract in connection with use of Status Software.


 9. Fees
@@ -252,6 +262,7 @@ You release Status from all liability related to any claim, cause of action, con
 14. Limitation of liability

 Status will not be held liable to you under any contract, negligence, strict liability, or other legal or equitable theory for any lost profits, cost of procurement for substitute services, or any special, incidental, or consequential damages related to, arising from, or in any way connected with these terms, Status, your use of Status Software, particularly where Status has indicated that it is not responsible. This includes without limitation, your use of SNT or other Digital Assets (creating, distributing, transacting in or otherwise) even if Status has been advised of the possibility of such damages.
+
 In any event, Status’ aggregate liability for any claims is limited to EUR 100 (one hundred Euros). This limitation of liability will apply to the extent permitted by applicable law.


@@ -37,6 +37,8 @@ SECRETS_ENV_VARS=(
    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
+    'ALCHEMY_BASE_MAINNET_TOKEN'
+    'ALCHEMY_BASE_SEPOLIA_TOKEN'
    'RARIBLE_MAINNET_API_KEY'
    'RARIBLE_TESTNET_API_KEY'
    'INFURA_TOKEN'
@@ -58,7 +58,7 @@
               :preloads          [;; The official recommendation is to
                                   ;; load the debugger preload first.
                                   flow-storm.api
-                                   re-frisk-remote.preload
+                                   dev.re-frisk-preload
                                   status-im.setup.schema-preload
                                   ;; In order to use component test helpers in the REPL we need to
                                   ;; preload namespaces that are not normally required by
@@ -87,7 +87,9 @@
     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_BASE_MAINNET_TOKEN #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"}
    :compiler-options {:output-feature-set :es5
                       ;; We disable `:fn-deprecated` warnings because we
                       ;; are managing deprecation via clj-kondo and we
@@ -123,7 +125,9 @@
     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_BASE_MAINNET_TOKEN     #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN     #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
                       ;;is an intermittent warning with deftype
@@ -165,6 +169,8 @@
    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+    status-im.config/ALCHEMY_BASE_MAINNET_TOKEN     #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
+    status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN     #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"
    status-im.config/WALLET_CONNECT_PROJECT_ID      #shadow/env "WALLET_CONNECT_PROJECT_ID"}
   :compiler-options
   {;; needed because we override require and it
@@ -0,0 +1,5 @@
+(ns dev.re-frisk-preload
+  (:require [re-frisk-remote.core :as re-frisk-remote]
+            [status-im.config]))
+
+(re-frisk-remote/enable {:host (str status-im.config/re-frisk-host ":" status-im.config/re-frisk-port)})
@@ -5,7 +5,6 @@
    [legacy.status-im.data-store.messages :as data-store.messages]
    [legacy.status-im.utils.deprecated-types :as types]
    [react-native.platform :as platform]
-    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
    [status-im.contexts.chat.messenger.messages.list.state :as view.state]
    [utils.re-frame :as rf]))
@@ -119,6 +118,26 @@
  (when (get-in db [:messages chat-id message-id])
    {:db (assoc-in db [:messages chat-id message-id :outgoing-status] status)}))

+(defn- update-db-delete-locally-without-time-limit
+  "Delete message in re-frame db, used to handle received removed-messages"
+  [db chat-id message-id deleted-by]
+  (when (get-in db [:messages chat-id message-id])
+    (update-in db [:messages chat-id message-id] assoc :deleted? true :deleted-by deleted-by)))
+
+(rf/defn delete-messages-locally
+  "Mark messages :deleted? localy in client"
+  {:events [:chat.ui/delete-messages-localy]}
+  [{:keys [db]} messages chat-id]
+  (let [new-db (->> messages
+                    (filter #(get-in db [:messages chat-id (:message-id %)]))
+                    (reduce #(update-db-delete-locally-without-time-limit %1
+                                                                          chat-id
+                                                                          (:message-id %2)
+                                                                          (:deleted-by %2))
+                            db))]
+    (when new-db
+      (message-list/rebuild-message-list {:db new-db} chat-id))))
+
 (rf/defn handle-removed-messages
  [cofx removed-messages]
  (let [mark-as-deleted-fx (->> removed-messages
@@ -127,7 +146,7 @@
                                             :deleted-by (:deletedBy %)))
                                (group-by :chatId)
                                (mapv (fn [[chat-id messages]]
-                                        (delete-message/delete-messages-localy messages chat-id))))
+                                        (delete-messages-locally messages chat-id))))
        mark-as-seen-fx    (mapv
                            (fn [removed-message]
                              (let [chat-id    (:chatId removed-message)
@@ -7,6 +7,7 @@
    legacy.status-im.chat.models.loading
    legacy.status-im.data-store.chats
    legacy.status-im.data-store.visibility-status-updates
+    legacy.status-im.ens.core
    legacy.status-im.fleet.core
    legacy.status-im.group-chats.core
    legacy.status-im.log-level.core
@@ -0,0 +1,43 @@
+(ns ^{:doc "Mailserver events and API"} legacy.status-im.mailserver.core
+  (:require
+    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/defn handle-mailserver-changed
+  [{:keys [db]} ms]
+  (when (seq ms)
+    {:db (assoc db :mailserver/current-id (keyword ms))}))
+
+(rf/defn handle-mailserver-available
+  [{:keys [db]} ms]
+  {:db (assoc db :mailserver/current-id (keyword ms))})
+
+(rf/defn toggle-use-mailservers
+  [_ value]
+  {:json-rpc/call
+   [{:method     "wakuext_toggleUseMailservers"
+     :params     [value]
+     :on-success #(log/info "successfully toggled use-mailservers" value)
+     :on-error   #(log/error "failed to toggle use-mailserver" value %)}]})
+
+(rf/defn update-use-mailservers
+  {:events [:mailserver.ui/use-history-switch-pressed]}
+  [cofx use-mailservers?]
+  (rf/merge cofx
+            (multiaccounts.update/optimistic :use-mailservers? use-mailservers?)
+            (toggle-use-mailservers use-mailservers?)))
+
+(defn add-mailservers
+  [db mailservers]
+  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
+            (let [updated-mailserver
+                  (-> mailserver
+                      (update :id keyword)
+                      (assoc :name (if (seq name) name id))
+                      (dissoc :fleet))]
+              (assoc-in db
+               [:mailserver/mailservers (keyword fleet) (keyword id)]
+               updated-mailserver)))
+          db
+          mailservers))
@@ -1,6 +1,5 @@
 (ns legacy.status-im.subs.mailservers
  (:require
-    [legacy.status-im.fleet.core :as fleet]
    [re-frame.core :as re-frame]))

 (re-frame/reg-sub
@@ -17,10 +16,3 @@
 :<- [:mailserver/mailservers]
 (fn [[current-fleet mailservers]]
   (current-fleet mailservers)))
-
-(re-frame/reg-sub
- :mailserver/preferred-id
- :<- [:profile/profile]
- (fn [multiaccount]
-   (get-in multiaccount
-           [:pinned-mailservers (fleet/current-fleet-sub multiaccount)])))
@@ -38,11 +38,6 @@
 ;;mailserver
 (reg-root-key-sub :mailserver/current-id :mailserver/current-id)
 (reg-root-key-sub :mailserver/mailservers :mailserver/mailservers)
-(reg-root-key-sub :mailserver.edit/mailserver :mailserver.edit/mailserver)
-(reg-root-key-sub :mailserver/state :mailserver/state)
-(reg-root-key-sub :mailserver/pending-requests :mailserver/pending-requests)
-(reg-root-key-sub :mailserver/request-error? :mailserver/request-error)
-(reg-root-key-sub :mailserver/fetching-gaps-in-progress :mailserver/fetching-gaps-in-progress)

 ;;contacts
 (reg-root-key-sub :contacts/contacts-raw :contacts/contacts)
@@ -129,7 +129,8 @@
                           :transport/confirm-messages-processed
                           :group-chats/extract-membership-signature
                           :utils/dispatch-later
-                           :json-rpc/call})
+                           :json-rpc/call
+                           :fx})

  (let [opts (parse-args args)]
    (execute-cli opts)))
@@ -67,7 +67,7 @@
                 :else    theme)
        {:keys [icon-color background-color text-color border-color]}
        (themes theme')]
-    [rn/touchable-without-feedback
+    [rn/pressable
     (merge {:disabled            disabled
             :accessibility-label accessibility-label}
            (when on-press
@@ -1,41 +0,0 @@
-(ns legacy.status-im.ui.screens.offline-messaging-settings.styles
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]
-    [legacy.status-im.utils.styles :as styles]))
-
-(def wrapper
-  {:flex 1})
-
-(styles/defn mailserver-item
-  []
-  {:flex-direction     :row
-   :align-items        :center
-   :justify-content    :space-between
-   :padding-horizontal 16
-   :ios                {:height 64}
-   :android            {:height 56}})
-
-(def mailserver-item-name-text
-  {:typography :title})
-
-(def switch-container
-  {:height 52})
-
-(def automatic-selection-container
-  {:border-top-width 1
-   :border-top-color colors/gray-lighter
-   :margin-top       16})
-
-(def explanation-text
-  {:color colors/gray})
-
-(def use-history-explanation-text-container
-  {:margin-right  16
-   :margin-left   16
-   :margin-top    8
-   :margin-bottom 16})
-
-(def history-nodes-label
-  {:color              colors/gray
-   :padding-horizontal 16
-   :margin-top         48})
@@ -1,88 +0,0 @@
-(ns legacy.status-im.ui.screens.offline-messaging-settings.views
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]
-    [legacy.status-im.ui.components.core :as quo]
-    [legacy.status-im.ui.components.icons.icons :as icons]
-    [legacy.status-im.ui.components.list.views :as list]
-    [legacy.status-im.ui.components.react :as react]
-    [legacy.status-im.ui.components.topbar :as topbar]
-    [legacy.status-im.ui.screens.offline-messaging-settings.styles :as styles]
-    [legacy.status-im.ui.screens.profile.components.views :as profile.components]
-    [re-frame.core :as re-frame]
-    [utils.i18n :as i18n]))
-
-(defn pinned-state
-  [pinned?]
-  [react/view {:style styles/automatic-selection-container}
-   [react/view {:style styles/switch-container}
-    [profile.components/settings-switch-item
-     {:label-kw  :t/mailserver-automatic
-      :value     (not pinned?)
-      :action-fn #(if pinned?
-                    (re-frame/dispatch [:mailserver.ui/unpin-pressed])
-                    (re-frame/dispatch [:mailserver.ui/pin-pressed]))}]]
-   [react/view {:style {:padding-horizontal 16}}
-    [react/text {:style styles/explanation-text}
-     (i18n/label :t/mailserver-automatic-switch-explanation)]]])
-
-(defn render-row
-  [{:keys [name id custom]} _ _ {:keys [current-mailserver-id preferred-mailserver-id]}]
-  (let [pinned?    preferred-mailserver-id
-        connected? (= id current-mailserver-id)
-        visible?   (or pinned? ; show everything when auto selection is turned off
-                       (and (not pinned?) ; auto selection turned on
-                            (= current-mailserver-id id)))] ; show only the selected server
-
-    (when visible?
-      [react/touchable-highlight
-       {:on-press            (when pinned?
-                               #(if custom
-                                  (re-frame/dispatch [:mailserver.ui/custom-mailserver-selected id])
-                                  (re-frame/dispatch [:mailserver.ui/default-mailserver-selected id])))
-        :accessibility-label :mailserver-item}
-       [react/view (styles/mailserver-item)
-        [react/text {:style styles/mailserver-item-name-text}
-         name]
-
-        (if pinned?
-          [quo/radio {:value connected?}]
-          [icons/icon :check {:color colors/blue}])]])))
-
-(views/defview offline-messaging-settings
-  []
-  (views/letsubs [current-mailserver-id      [:mailserver/current-id]
-                  preferred-mailserver-id    [:mailserver/preferred-id]
-                  mailservers                [:mailserver/fleet-mailservers]
-                  {:keys [use-mailservers?]} [:profile/profile]]
-    [react/view {:style styles/wrapper}
-     [topbar/topbar
-      {:title (i18n/label :t/history-nodes)
-       :right-accessories
-       [{:icon     :main-icons/add-circle
-         :on-press #(re-frame/dispatch [:mailserver.ui/add-pressed])}]}]
-
-     [react/scroll-view
-      [react/view {:style styles/switch-container}
-       [profile.components/settings-switch-item
-        {:label-kw  :t/offline-messaging-use-history-nodes
-         :value     use-mailservers?
-         :action-fn #(re-frame/dispatch [:mailserver.ui/use-history-switch-pressed
-                                         (not use-mailservers?)])}]]
-      [react/view {:style styles/use-history-explanation-text-container}
-       [react/text {:style styles/explanation-text}
-        (i18n/label :t/offline-messaging-use-history-explanation)]]
-
-      (when use-mailservers?
-        [:<>
-         [pinned-state preferred-mailserver-id]
-
-         [react/text {:style styles/history-nodes-label}
-          (i18n/label :t/history-nodes)]
-         [list/flat-list
-          {:data               (vals mailservers)
-           :default-separator? false
-           :key-fn             :name
-           :render-data        {:current-mailserver-id   current-mailserver-id
-                                :preferred-mailserver-id preferred-mailserver-id}
-           :render-fn          render-row}]])]]))
@@ -12,7 +12,6 @@
    [legacy.status-im.ui.screens.help-center.views :as help-center]
    [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
    [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
-    [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
    [legacy.status-im.ui.screens.pairing.views :as pairing]
    [legacy.status-im.ui.screens.peers-stats :as peers-stats]
    [legacy.status-im.ui.screens.profile.seed.views :as profile.seed]
@@ -113,9 +112,6 @@
    :options   {:topBar (topbar-options (i18n/label :t/devices))
                :insets {:top? true}}
    :component pairing/installations}
-   {:name      :offline-messaging-settings
-    :options   {:insets {:top? true}}
-    :component offline-messaging-settings/offline-messaging-settings}
   {:name      :rpc-usage-info
    :options   {:topBar (topbar-options :t/rpc-usage-info)
                :insets {:top? true}}
@@ -7,6 +7,7 @@
    [legacy.status-im.ui.components.react :as react]
    [quo.core :as quo]
    [re-frame.core :as re-frame]
+    [react-native.clipboard :as clipboard]
    [status-im.constants :as constants]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -67,10 +68,10 @@
       {:size                :small
        :accessibility-label :offline-messages-settings-button
        :title               (i18n/label :t/history-nodes)
-        :on-press            #(re-frame/dispatch [:navigate-to :offline-messaging-settings])
+        :on-press            (fn []
+                               (clipboard/set-string current-mailserver-name))
        :accessory           :text
-        :accessory-text      (when use-mailservers? current-mailserver-name)
-        :chevron             true}]
+        :accessory-text      (when use-mailservers? current-mailserver-name)}]
      ;; TODO(Ferossgp): Devider componemt
      [react/view
       {:height           1
@@ -170,12 +170,6 @@
                                                 :Bip39Passphrase password})
                               callback))

-(defn verify
-  "NOTE: beware, the password has to be sha3 hashed"
-  [address hashed-password callback]
-  (log/debug "[native-module] verify")
-  (.verify ^js (account-manager) address hashed-password callback))
-
 (defn set-soft-input-mode
  [mode]
  (log/debug "[native-module]  set-soft-input-mode")
@@ -259,15 +253,19 @@

 (defn hash-typed-data
  "used for keycard"
-  [data callback]
-  (log/debug "[native-module] hash-typed-data")
-  (.hashTypedData ^js (encryption) data callback))
+  ([data]
+   (native-utils/promisify-native-module-call hash-typed-data data))
+  ([data callback]
+   (log/debug "[native-module] hash-typed-data")
+   (.hashTypedData ^js (encryption) data callback)))

 (defn hash-typed-data-v4
  "used for keycard"
-  [data callback]
-  (log/debug "[native-module] hash-typed-data-v4")
-  (.hashTypedDataV4 ^js (encryption) data callback))
+  ([data]
+   (native-utils/promisify-native-module-call hash-typed-data-v4 data))
+  ([data callback]
+   (log/debug "[native-module] hash-typed-data-v4")
+   (.hashTypedDataV4 ^js (encryption) data callback)))

 (defn send-transaction-with-signature
  "used for keycard"
@@ -388,16 +386,6 @@
    ;; in unknown scenarios we also consider the device rooted to avoid degrading security
    :else (callback true)))

-(defn encode-transfer
-  [to-norm amount-hex]
-  (log/debug "[native-module] encode-transfer")
-  (.encodeTransfer ^js (encryption) to-norm amount-hex))
-
-(defn encode-function-call
-  [method params]
-  (log/debug "[native-module] encode-function-call")
-  (.encodeFunctionCall ^js (encryption) method (types/clj->json params)))
-
 (defn decode-parameters
  [bytes-string types]
  (log/debug "[native-module] decode-parameters")
@@ -10,9 +10,7 @@
   :justify-content  :center
   :border-radius    (/ container-size 2)
   :overflow         :hidden
-   :background-color (colors/theme-colors (colors/custom-color customization-color 50)
-                                          (colors/custom-color customization-color 60)
-                                          theme)})
+   :background-color (colors/resolve-color customization-color theme)})

 (defn avatar-identifier
  [theme]
@@ -5,16 +5,13 @@
  [customization-color neutral? theme]
  (if neutral?
    (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme)
-    (colors/custom-color customization-color 50 20)))
+    (colors/resolve-color customization-color theme 20)))

 (defn- text-color
  [customization-color neutral? theme]
  (if neutral?
    (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme)
-    (colors/theme-colors
-     (colors/custom-color customization-color 50)
-     (colors/custom-color customization-color 60)
-     theme)))
+    (colors/resolve-color customization-color theme)))

 (defn container
  [circle-size customization-color neutral? theme]
@@ -2,9 +2,10 @@
  (:require
    [quo.foundations.colors :as colors]))

-(def container
+(defn container
+  [theme]
  {:height           40
-   :background-color (colors/custom-color :blue 50 20)
+   :background-color (colors/resolve-color :blue theme 20)
   :flex-direction   :row
   :align-items      :center
   :padding-right    22
@@ -14,7 +14,7 @@
    (when (pos? pins-count)
      [rn/touchable-opacity
       {:accessibility-label :pinned-banner
-        :style               style/container
+        :style               (style/container theme)
        :active-opacity      1
        :on-press            on-press}
       (when-not hide-pin?
@@ -44,9 +44,7 @@

 (defn cursor-color
  [customization-color theme]
-  (colors/theme-colors (colors/custom-color customization-color 50)
-                       (colors/custom-color customization-color 60)
-                       theme))
+  (colors/resolve-color customization-color theme))

 (defn placeholder-color
  [state blur? theme]
@@ -54,81 +54,80 @@
                         (fn []
                           (set-pressed-state nil)
                           (when on-press-out (on-press-out))))]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:disabled                (boolean disabled?)
      :accessibility-label     accessibility-label
      :on-press-in             on-press-in-cb
      :on-press-out            on-press-out-cb
      :on-press                on-press
      :allow-multiple-presses? allow-multiple-presses?
-      :on-long-press           on-long-press}
+      :on-long-press           on-long-press
+      :style                   (merge
+                                (style/shape-style-container size border-radius)
+                                container-style)}
     [rn/view
      {:style (merge
-               (style/shape-style-container size border-radius)
-               container-style)}
+               (style/style-container {:size             size
+                                       :disabled?        disabled?
+                                       :border-radius    border-radius
+                                       :background-color background-color
+                                       :border-color     border-color
+                                       :icon-only?       icon-only?
+                                       :icon-top         icon-top
+                                       :icon-left        icon-left
+                                       :icon-right       icon-right})
+               inner-style)}
+      (when overlay-customization-color
+        [customization-colors/overlay
+         {:customization-color overlay-customization-color
+          :theme               theme
+          :pressed?            (if pressed? pressed? pressed-state?)}])
+      (when (= background :photo)
+        [blur/view
+         {:blur-radius   20
+          :blur-type     blur-type
+          :overlay-color blur-overlay-color
+          :style         style/blur-view}])
+      (when icon-top
+        [rn/view
+         [quo.icons/icon icon-top
+          {:container-style {:margin-bottom 2
+                             :opacity       (when disabled? 0.3)}
+           :color           (or icon-top-color icon-color)
+           :size            icon-size}]])
+      (when icon-left
+        [rn/view
+         {:style (style/icon-left-icon-style
+                  {:size      size
+                   :icon-size icon-size
+                   :disabled? disabled?})}
+         [quo.icons/icon icon-left
+          {:color (or icon-left-color icon-color)
+           :size  icon-size}]])
      [rn/view
-       {:style (merge
-                (style/style-container {:size             size
-                                        :disabled?        disabled?
-                                        :border-radius    border-radius
-                                        :background-color background-color
-                                        :border-color     border-color
-                                        :icon-only?       icon-only?
-                                        :icon-top         icon-top
-                                        :icon-left        icon-left
-                                        :icon-right       icon-right})
-                inner-style)}
-       (when overlay-customization-color
-         [customization-colors/overlay
-          {:customization-color overlay-customization-color
-           :theme               theme
-           :pressed?            (if pressed? pressed? pressed-state?)}])
-       (when (= background :photo)
-         [blur/view
-          {:blur-radius   20
-           :blur-type     blur-type
-           :overlay-color blur-overlay-color
-           :style         style/blur-view}])
-       (when icon-top
-         [rn/view
-          [quo.icons/icon icon-top
-           {:container-style {:margin-bottom 2
-                              :opacity       (when disabled? 0.3)}
-            :color           (or icon-top-color icon-color)
-            :size            icon-size}]])
-       (when icon-left
-         [rn/view
-          {:style (style/icon-left-icon-style
-                   {:size      size
-                    :icon-size icon-size
-                    :disabled? disabled?})}
-          [quo.icons/icon icon-left
-           {:color (or icon-left-color icon-color)
-            :size  icon-size}]])
-       [rn/view
-        (cond
-          icon-only?
-          [quo.icons/icon children
-           {:color label-color
-            :size  icon-size}]
+       (cond
+         icon-only?
+         [quo.icons/icon children
+          {:color label-color
+           :size  icon-size}]

-          (string? children)
-          [text/text
-           {:size            (when (#{56 24} size) :paragraph-2)
-            :weight          :medium
-            :number-of-lines 1
-            :style           {:color   label-color
-                              :opacity (when (and disabled? (= theme :dark)) 0.3)}}
-           children]
+         (string? children)
+         [text/text
+          {:size            (when (#{56 24} size) :paragraph-2)
+           :weight          :medium
+           :number-of-lines 1
+           :style           {:color   label-color
+                             :opacity (when (and disabled? (= theme :dark)) 0.3)}}
+          children]

-          (vector? children)
-          children)]
-       (when icon-right
-         [rn/view
-          {:style (style/icon-right-icon-style
-                   {:size      size
-                    :icon-size icon-size
-                    :disabled? disabled?})}
-          [quo.icons/icon icon-right
-           {:color (or icon-right-color icon-color)
-            :size  icon-size}]])]]]))
+         (vector? children)
+         children)]
+      (when icon-right
+        [rn/view
+         {:style (style/icon-right-icon-style
+                  {:size      size
+                   :icon-size icon-size
+                   :disabled? disabled?})}
+         [quo.icons/icon icon-right
+          {:color (or icon-right-color icon-color)
+           :size  icon-size}]])]]))
@@ -11,14 +11,8 @@
  [{:keys [type pressed? customization-color theme]}]
  (if (= type :mention)
    (if pressed?
-      (colors/theme-colors
-       (colors/custom-color customization-color 60)
-       (colors/custom-color customization-color 50)
-       theme)
-      (colors/theme-colors
-       (colors/custom-color customization-color 50)
-       (colors/custom-color customization-color 60)
-       theme))
+      (colors/resolve-color customization-color (colors/invert-theme theme))
+      (colors/resolve-color customization-color theme))
    (if pressed?
      (colors/theme-colors colors/neutral-80-opa-80 colors/white-opa-80 theme)
      (colors/theme-colors colors/neutral-80-opa-70 colors/white-opa-70 theme))))
@@ -41,7 +41,7 @@
    :justify-content :space-around}])

 (defn track
-  [{:keys [disabled? customization-color height blur?]}]
+  [{:keys [disabled? customization-color height blur? theme]}]
  {:align-items      :flex-start
   :justify-content  :center
   :border-radius    14
@@ -49,7 +49,7 @@
   :align-self       :stretch
   :padding          constants/track-padding
   :opacity          (if disabled? 0.3 1)
-   :background-color (utils/track-color customization-color blur?)})
+   :background-color (utils/track-color customization-color theme blur?)})

 (defn track-cover
  [interpolate-track]
@@ -6,27 +6,21 @@
 (defn main-color
  "`customization-color` Customization color"
  [customization-color theme]
-  (colors/theme-colors
-   (colors/custom-color customization-color 50)
-   (colors/custom-color customization-color 60)
-   theme))
+  (colors/resolve-color customization-color theme))

 (defn track-color
  "`customization-color` Customization color"
-  ([customization-color blur?]
+  ([customization-color theme blur?]
   (if blur?
     colors/white-opa-5
-     (colors/custom-color customization-color 50 10))))
+     (colors/resolve-color customization-color theme 10))))

 (defn text-color
  "`customization-color` Customization color"
  [customization-color theme blur?]
  (if blur?
    colors/white-opa-40
-    (colors/theme-colors
-     (colors/custom-color customization-color 50)
-     (colors/custom-color customization-color 60)
-     theme)))
+    (colors/resolve-color customization-color theme)))

 (defn clamp-value
  [value min-value max-value]
@@ -88,7 +88,8 @@
       :style     (merge (style/track {:disabled?           disabled?
                                       :customization-color custom-color
                                       :height              (dimensions :track-height)
-                                       :blur?               blur?})
+                                       :blur?               blur?
+                                       :theme               theme})
                         container-style)
       :on-layout on-track-layout}
      [reanimated/view {:style (style/track-cover interpolate-track)}
@@ -22,9 +22,7 @@

        hex-color (if (= :feng-shui color)
                    (colors/theme-colors colors/neutral-100 colors/white theme)
-                    (colors/theme-colors (colors/custom-color color 50)
-                                         (colors/custom-color color 60)
-                                         theme))]
+                    (colors/resolve-color color theme))]

    [rn/pressable
     {:style                   (style/color-button hex-color selected? idx window-width)
@@ -7,10 +7,7 @@
 (defn dot-background-color
  [customization-color theme blur?]
  (cond
-    customization-color (colors/theme-colors
-                         (colors/custom-color customization-color 50)
-                         (colors/custom-color customization-color 60)
-                         theme)
+    customization-color (colors/resolve-color customization-color theme)
    blur?               (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
    :else               (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))

@@ -29,12 +29,12 @@
 (defn view
  [{:keys [title description on-press accessibility-label banner style]}]
  (let [theme (quo.theme/use-theme)]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:on-press            on-press
-      :accessibility-label accessibility-label}
-     [rn/view {:style (merge (style/community-card theme) style)}
-      [card-title-and-description title description theme]
-      [rn/image
-       {:style               style/discover-illustration
-        :source              banner
-        :accessibility-label :discover-communities-illustration}]]]))
+      :accessibility-label accessibility-label
+      :style               (merge (style/community-card theme) style)}
+     [card-title-and-description title description theme]
+     [rn/image
+      {:style               style/discover-illustration
+       :source              banner
+       :accessibility-label :discover-communities-illustration}]]))
@@ -35,39 +35,39 @@
  [{:keys [community on-press width]}]
  (let [theme                                                              (quo.theme/use-theme)
        {:keys [name description locked? images cover status tokens tags]} community]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:accessibility-label :community-card-item
-      :on-press            on-press}
-     [rn/view {:style (style/community-card 20 theme)}
-      [rn/view
-       {:style    {:width         width
-                   :height        230
-                   :border-radius 20}
-        :on-press on-press}
-       [rn/view {:style style/detail-container}
-        [rn/view (style/community-cover-container 60)
-         [rn/image
-          {:source cover
-           :style  {:flex                    1
-                    :border-top-right-radius 20
-                    :border-top-left-radius  20}}]]
-        [rn/view (style/card-view-content-container 12 theme)
-         [rn/view (style/card-view-chat-icon 48 theme)
-          [icon/community-icon {:images images} 48]]
-         (when (= status :gated)
-           [rn/view (style/permission-tag-styles)
-            [community-view/permission-tag-container
-             {:locked? locked?
-              :status  status
-              :tokens  tokens}]])
-         [community-view/community-title
-          {:title       name
-           :description description}]
-         [rn/view {:style (style/card-stats-position)}
-          [community-view/community-stats-column
-           {:type :card-view}]]
-         [rn/view {:style (style/community-tags-position)}
-          [community-view/community-tags {:tags tags}]]]]]]]))
+      :on-press            on-press
+      :style               (style/community-card 20 theme)}
+     [rn/view
+      {:style    {:width         width
+                  :height        230
+                  :border-radius 20}
+       :on-press on-press}
+      [rn/view {:style style/detail-container}
+       [rn/view (style/community-cover-container 60)
+        [rn/image
+         {:source cover
+          :style  {:flex                    1
+                   :border-top-right-radius 20
+                   :border-top-left-radius  20}}]]
+       [rn/view (style/card-view-content-container 12 theme)
+        [rn/view (style/card-view-chat-icon 48 theme)
+         [icon/community-icon {:images images} 48]]
+        (when (= status :gated)
+          [rn/view (style/permission-tag-styles)
+           [community-view/permission-tag-container
+            {:locked? locked?
+             :status  status
+             :tokens  tokens}]])
+        [community-view/community-title
+         {:title       name
+          :description description}]
+        [rn/view {:style (style/card-stats-position)}
+         [community-view/community-stats-column
+          {:type :card-view}]]
+        [rn/view {:style (style/community-tags-position)}
+         [community-view/community-tags {:tags tags}]]]]]]))

 (defn view
  [{:keys [loading?] :as props}]
@@ -5,9 +5,7 @@
 (defn get-color
  [type customization-color theme]
  (case type
-    :default   (colors/theme-colors (colors/custom-color customization-color 50)
-                                    (colors/custom-color customization-color 60)
-                                    theme)
+    :default   (colors/resolve-color customization-color theme)
    :secondary (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme)
    :grey      (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)
    :outline   (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
@@ -14,9 +14,13 @@
    (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-10 theme)
    (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)))

-(defn active-background-color [customization-color] (colors/custom-color customization-color 50 10))
+(defn active-background-color
+  [customization-color theme]
+  (colors/resolve-color customization-color theme 10))

-(defn complete-background-color [customization-color] (colors/custom-color customization-color 50))
+(defn complete-background-color
+  [customization-color]
+  (colors/resolve-color customization-color :light))

 (defn container
  [{:keys [size type in-blur-view? theme customization-color]}]
@@ -29,7 +33,7 @@
           :border-color (neutral-border-color in-blur-view? theme))

    (= type :active)
-    (assoc :background-color (active-background-color customization-color))
+    (assoc :background-color (active-background-color customization-color theme))

    (= type :complete)
    (assoc :background-color (complete-background-color customization-color))))
@@ -9,16 +9,15 @@
    [react-native.svg :as svg]
    [utils.i18n :as i18n]))

-
 (def strength-divider-types
  {:very-weak   {:default-text (i18n/label :t/strength-divider-very-weak-label)
                 :color        colors/danger-60
                 :percentage   20}
   :weak        {:default-text (i18n/label :t/strength-divider-weak-label)
-                 :color        (colors/custom-color :orange 60)
+                 :color        (colors/resolve-color :orange nil)
                 :percentage   40}
   :okay        {:default-text (i18n/label :t/strength-divider-okay-label)
-                 :color        (colors/custom-color :yellow 60)
+                 :color        (colors/resolve-color :yellow nil)
                 :percentage   60}
   :strong      {:default-text (i18n/label :t/strength-divider-strong-label)
                 :color        colors/success-60
@@ -39,7 +39,7 @@
   :right-icon-color   colors/white-opa-20
   :right-icon-color-2 colors/white
   :label-color        colors/white
-   :background-color   (colors/custom-color customization-color 50)})
+   :background-color   (colors/resolve-color customization-color :light)})

 (def sizes-to-exclude-blur-in-photo-bg #{:size-40})

@@ -76,10 +76,8 @@
        y-axis-label-background-color    (colors/theme-colors colors/white-70-blur-opaque
                                                              colors/neutral-95
                                                              theme)
-        customization-color              (colors/theme-colors
-                                          (colors/custom-color customization-color 60)
-                                          (colors/custom-color customization-color 50)
-                                          theme)
+        customization-color              (colors/resolve-color customization-color
+                                                               (colors/invert-theme theme))
        y-axis-label-texts               (utils/calculate-y-axis-labels min-value step-value 4)
        x-axis-label-texts               (utils/calculate-x-axis-labels data 5)
        reference-label-background-color (colors/theme-colors colors/neutral-80-opa-5-opaque
@@ -26,10 +26,7 @@
                        customization-color customization-color
                        (= state :positive) :success
                        :else               :danger)]
-    (colors/theme-colors
-     (colors/custom-color color-keyword 50)
-     (colors/custom-color color-keyword 60)
-     theme)))
+    (colors/resolve-color color-keyword theme)))

 (defn view
  [{:keys [data state time-frame customization-color]}]
@@ -37,9 +37,7 @@
  [theme]
  [rn/view {:style style/clear-icon-container}
   [icon/icon :i/positive-state
-    {:color (colors/theme-colors (colors/custom-color :success 50)
-                                 (colors/custom-color :success 60)
-                                 theme)
+    {:color (colors/resolve-color :success theme)
     :size  20}]])

 (defn- get-placeholder-text-color
@@ -12,7 +12,7 @@
     :button-border (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 theme)
     :password-icon (colors/theme-colors colors/neutral-100 colors/white-opa-70 theme)
     :clear-icon    (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 theme)
-     :cursor        (colors/theme-colors (colors/custom-color :blue 50)
+     :cursor        (colors/theme-colors (colors/resolve-color :blue :light)
                                         colors/white
                                         theme)}
    {:label         (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
@@ -20,9 +20,7 @@
     :button-border (colors/theme-colors colors/neutral-30 colors/neutral-70 theme)
     :clear-icon    (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)
     :password-icon (colors/theme-colors colors/neutral-50 colors/white theme)
-     :cursor        (colors/theme-colors (colors/custom-color :blue 50)
-                                         (colors/custom-color :blue 60)
-                                         theme)}))
+     :cursor        (colors/resolve-color :blue theme)}))

 (defn status-colors
  [status blur? theme]
@@ -133,7 +131,7 @@
  [variant-colors]
  {:color (:label variant-colors)})

-(def counter-container
+(def right-label-container
  {:flex        1
   :align-items :flex-end})

@@ -7,8 +7,8 @@
            [react-native.core :as rn]
            [react-native.platform :as platform]))

-(defn- label-&-counter
-  [{:keys [label current-chars char-limit variant-colors theme]}]
+(defn- label-line
+  [{:keys [label label-right current-chars char-limit variant-colors theme]}]
  [rn/view
   {:accessibility-label :input-labels
    :style               style/texts-container}
@@ -18,17 +18,24 @@
      :weight :medium
      :size   :paragraph-2}
     label]]
-   (when-let [count-text (some->> char-limit
-                                  (str current-chars "/"))]
-     [rn/view {:style style/counter-container}
+   (when label-right
+     [rn/view {:style style/right-label-container}
      [text/text
-       {:style  (style/counter-color {:current-chars  current-chars
-                                      :char-limit     char-limit
-                                      :variant-colors variant-colors
-                                      :theme          theme})
+       {:style  (style/label-color variant-colors)
        :weight :regular
        :size   :paragraph-2}
-       count-text]])])
+       label-right]])
+   (when char-limit
+     (let [count-text (str current-chars "/" char-limit)]
+       [rn/view {:style style/right-label-container}
+        [text/text
+         {:style  (style/counter-color {:current-chars  current-chars
+                                        :char-limit     char-limit
+                                        :variant-colors variant-colors
+                                        :theme          theme})
+          :weight :regular
+          :size   :paragraph-2}
+         count-text]]))])

 (defn- left-accessory
  [{:keys [variant-colors small? icon-name]}]
@@ -65,7 +72,7 @@
 (defn- base-input
  [{:keys [blur? error? right-icon left-icon disabled? small? button
           label char-limit multiline? clearable? on-focus on-blur container-style input-container-style
-           on-change-text on-char-limit-reach weight default-value on-clear placeholder]
+           on-change-text on-char-limit-reach weight default-value on-clear placeholder label-right]
    :as   props}]
  (let [theme                  (quo.theme/use-theme)
        ref                    (rn/use-ref-atom nil)
@@ -115,10 +122,11 @@
        ;; https://github.com/facebook/react-native/issues/27687
        modified-placeholder   (if platform/android? (str "\u2009" placeholder) placeholder)]
    [rn/view {:style container-style}
-     (when (or label char-limit)
-       [label-&-counter
+     (when (or label char-limit label-right)
+       [label-line
        {:variant-colors variant-colors
         :label          label
+         :label-right    label-right
         :current-chars  char-count
         :char-limit     char-limit
         :theme          theme}])
@@ -199,6 +207,7 @@
  - :on-clear - Function executed when the clear button is pressed.
  - :button - Map containing `:on-press` & `:text` keys, if provided renders a button
  - :label - A string to set as label for this input.
+  - :label-right - Additional label aligned to the right
  - :char-limit - A number to set a maximum char limit for this input.
  - :on-char-limit-reach - Function executed each time char limit is reached or exceeded.
  - :default-shown? - boolean to show password input initially
@@ -4,7 +4,7 @@

 (defn container
  [customization-color]
-  {:background-color   (colors/custom-color customization-color 50 40)
+  {:background-color   (colors/resolve-color customization-color :light 40)
   :padding-horizontal 12
   :padding-top        12
   :padding-bottom     10
@@ -36,9 +36,7 @@

 (defn cursor-color
  [customization-color theme]
-  (colors/theme-colors (colors/custom-color customization-color 50)
-                       (colors/custom-color customization-color 60)
-                       theme))
+  (colors/resolve-color customization-color theme))

 (defn error-word
  [theme]
@@ -25,8 +25,7 @@
  [customization-color blur? theme]
  (colors/alpha (if blur?
                  (colors/theme-colors colors/neutral-100 colors/white theme)
-                  (colors/custom-color customization-color
-                                       (if (= :dark theme) 60 50)))
+                  (colors/resolve-color customization-color theme))
                (if platform/ios? 1 0.2)))

 (def text-input-container {:flex 1})
@@ -17,7 +17,7 @@
    (h/render-with-theme-provider [address/view (with-defaults)])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/custom-color :blue 50 5)})))
+                              {:backgroundColor (colors/resolve-color :blue :light 5)})))

  (h/test "on-press-in changes state to :pressed with blur? enabled"
    (h/render-with-theme-provider [address/view (with-defaults {:blur? true})])
@@ -30,7 +30,7 @@
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/fire-event :on-press-out (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/custom-color :blue 50 10)})))
+                              {:backgroundColor (colors/resolve-color :blue :light 10)})))

  (h/test "on-press-out changes state to :active with blur? enabled"
    (h/render-with-theme-provider [address/view (with-defaults {:active-state? true :blur? true})])
@@ -5,11 +5,11 @@
 (defn- background-color
  [state customization-color blur?]
  (cond (and (or (= state :pressed) (= state :selected)) (not blur?))
-        (colors/custom-color customization-color 50 5)
+        (colors/resolve-color customization-color :light 5)
        (and (or (= state :pressed) (= state :selected)) blur?)
        colors/white-opa-5
        (and (= state :active) (not blur?))
-        (colors/custom-color customization-color 50 10)
+        (colors/resolve-color customization-color :light 10)
        (and (= state :active) blur?)
        colors/white-opa-10
        (and (= state :pressed) blur?) colors/white-opa-10
@@ -8,15 +8,15 @@
    (and pressed? (= theme :dark) blur?)          colors/white-opa-5

    pressed?                                      (colors/theme-colors
-                                                   (colors/custom-color customization-color 50 5)
-                                                   (colors/custom-color customization-color 60 5)
+                                                   (colors/override-color customization-color 5 50)
+                                                   (colors/override-color customization-color 5 60)
                                                   theme)

    (and (= state :active) (= theme :dark) blur?) colors/white-opa-10

    (= state :active)                             (colors/theme-colors
-                                                   (colors/custom-color customization-color 50 10)
-                                                   (colors/custom-color customization-color 60 10)
+                                                   (colors/override-color customization-color 10 50)
+                                                   (colors/override-color customization-color 10 60)
                                                   theme)

    :else                                         :transparent))
@@ -5,11 +5,11 @@
 (defn- background-color
  [{:keys [state blur? customization-color]}]
  (cond (and (or (= state :pressed) (= state :selected)) (not blur?))
-        (colors/custom-color customization-color 50 5)
+        (colors/resolve-color customization-color :light 5)
        (and (or (= state :pressed) (= state :selected)) blur?)
        colors/white-opa-5
        (and (= state :active) (not blur?))
-        (colors/custom-color customization-color 50 10)
+        (colors/resolve-color customization-color :light 10)
        (and (= state :active) blur?)
        colors/white-opa-10
        (and (= state :pressed) blur?) colors/white-opa-10
@@ -37,7 +37,7 @@
                                    {:accounts (repeat 1 account)})])
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/custom-color :blue 50 5)})))
+                              {:backgroundColor (colors/resolve-color :blue :light 5)})))

  (h/test "on-press-out changes state to :active if active-state? is true (default value)"
    (h/render-with-theme-provider [saved-contact-address/view
@@ -46,7 +46,7 @@
    (h/fire-event :on-press-in (h/get-by-label-text :container))
    (h/fire-event :on-press-out (h/get-by-label-text :container))
    (h/wait-for #(h/has-style (h/query-by-label-text :container)
-                              {:backgroundColor (colors/custom-color :blue 50 10)})))
+                              {:backgroundColor (colors/resolve-color :blue :light 10)})))

  (h/test "on-press-out changes state to :default if active-state? is false"
    (h/render-with-theme-provider [saved-contact-address/view
@@ -5,9 +5,9 @@
 (defn- background-color
  [{:keys [state customization-color]}]
  (cond (or (= state :pressed) (= state :selected))
-        (colors/custom-color customization-color 50 5)
+        (colors/resolve-color customization-color :light 5)
        (= state :active)
-        (colors/custom-color customization-color 50 10)
+        (colors/resolve-color customization-color :light 10)
        :else :transparent))

 (defn container
@@ -21,13 +21,13 @@
  [{:keys [type on-press on-check disabled? checked? child]} customization-color theme]
  (if (= type :custom)
    child
-    [rn/touchable-opacity
-     {:on-press on-press}
+    [rn/touchable-opacity {:on-press on-press}
     (case type
       :options
       [icons/icon :i/options
        {:size  20
         :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
+
       :checkbox
       [selectors/view
        {:type                :checkbox
@@ -36,6 +36,7 @@
         :accessibility-label :user-list-toggle-check
         :disabled?           disabled?
         :on-change           (when on-check on-check)}]
+
       :close
       [text/text "not implemented"]
       [rn/view])]))
@@ -95,7 +95,7 @@

 (defn info-button
  [on-press]
-  [rn/touchable-without-feedback
+  [rn/pressable
   {:on-press on-press}
   [icon/icon "message-gap-info" {:size 12 :no-color true :container-style {:padding 4}}]])

@@ -123,7 +123,7 @@
     :margin-right    2}
    [timestamp timestamp-far]
    (when on-info-button-pressed [info-button on-info-button-pressed])]
-   [rn/touchable-without-feedback
+   [rn/pressable
    {:style    {:flex 1 :margin-top 16 :margin-bottom 20}
     :on-press #(when on-press (on-press))}
    [text/text warning-label]]
@@ -10,7 +10,7 @@
   :top              6
   :left             51
   :position         :absolute
-   :background-color (colors/custom-color customization-color 60)})
+   :background-color (colors/resolve-color customization-color nil)})

 (def notification-counter
  {:position :absolute
@@ -76,15 +76,15 @@

 (defn- left-section
  [{:keys [avatar-props on-press customization-color]}]
-  [rn/touchable-without-feedback {:on-press on-press}
-   [rn/view
-    {:accessibility-label :open-profile}
-    [user-avatar/user-avatar
-     (merge {:status-indicator?   true
-             :ring?               true
-             :customization-color customization-color
-             :size                :small}
-            avatar-props)]]])
+  [rn/pressable
+   {:on-press            on-press
+    :accessibility-label :open-profile}
+   [user-avatar/user-avatar
+    (merge {:status-indicator?   true
+            :ring?               true
+            :customization-color customization-color
+            :size                :small}
+           avatar-props)]])

 (defn- right-section
  [{:keys [blur?
@@ -56,7 +56,7 @@

 (defn unread-dot
  [customization-color]
-  {:background-color (colors/custom-color (or customization-color :blue) 60)
+  {:background-color (colors/resolve-color (or customization-color :blue) nil)
   :border-radius    4
   :width            8
   :height           8})
@@ -35,7 +35,7 @@
     subtitle]]])

 (defn- main-variant
-  [{:keys [title subtitle button-label image max-height accessibility-label on-press]}]
+  [{:keys [title subtitle button-label image max-height accessibility-label on-press button-type]}]
  [rn/view {:style style/main-variant}
   [rn/view {:style style/main-variant-text-container}
    [text/text
@@ -58,7 +58,7 @@
   [button/button
    {:on-press            on-press
     :accessibility-label accessibility-label
-     :type                :grey
+     :type                (or button-type :grey)
     :size                40
     :container-style     style/main-button
     :theme               :dark
@@ -66,7 +66,8 @@
    button-label]])

 (defn small-option-card
-  [{:keys [variant title subtitle button-label image max-height on-press accessibility-label]
+  [{:keys [variant title subtitle button-label image max-height on-press accessibility-label
+           button-type container-style]
    :or   {variant :main accessibility-label :small-option-card}}]
  (let [main-variant?  (= variant :main)
        card-component (if main-variant? main-variant icon-variant)
@@ -74,7 +75,7 @@
                         (not main-variant?) style/icon-variant-height
                         max-height          (min max-height style/main-variant-height)
                         :else               style/main-variant-height)]
-    [rn/view {:style (style/card card-height)}
+    [rn/view {:style (merge (style/card card-height) container-style)}
     [card-component
      {:title               title
       :subtitle            subtitle
@@ -82,4 +83,5 @@
       :on-press            on-press
       :accessibility-label accessibility-label
       :image               image
-       :max-height          max-height}]]))
+       :max-height          max-height
+       :button-type         button-type}]]))
@@ -12,7 +12,7 @@
   :border-top-right-radius    16
   :border-bottom-left-radius  border-bottom-radius
   :border-bottom-right-radius border-bottom-radius
-   :background-color           (colors/custom-color customization-color 50 40)})
+   :background-color           (colors/resolve-color customization-color :light 40)})

 (def card-header
  {:flex-direction  :row
@@ -5,7 +5,7 @@
 (defn container
  [customization-color selected?]
  {:padding          12
-   :background-color (colors/custom-color customization-color 50 40)
+   :background-color (colors/resolve-color customization-color :light 40)
   :border-width     1
   :border-radius    16
   :flex             1
@@ -15,7 +15,8 @@
     :border-color     (colors/theme-colors colors/neutral-20 dark-border theme)}))

 (def text
-  {:margin-left 8})
+  {:flex        1
+   :margin-left 8})

 (def icon-container
  {:align-items :flex-end
@@ -11,28 +11,28 @@
 (defn view
  [{:keys [checked? blur? accessibility-label container-style on-change icon customization-color]} label]
  (let [theme (quo.theme/use-theme)]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:on-press            (when on-change
                             #(on-change (not checked?)))
-      :accessibility-label :disclaimer-touchable-opacity}
-     [rn/view {:style (merge container-style (style/container blur? theme))}
-      [selectors/view
-       {:type                :checkbox
-        :accessibility-label accessibility-label
-        :blur?               blur?
-        :checked?            checked?
-        :on-change           on-change
-        :customization-color customization-color}]
-      [text/text
-       {:size  :paragraph-2
-        :style style/text}
-       label]
-      (when icon
-        [rn/view {:style style/icon-container}
-         [icons/icon icon
-          {:accessibility-label :disclaimer-icon
-           :color               (if blur?
-                                  (colors/white-opa-70)
-                                  (colors/theme-colors colors/neutral-50
-                                                       colors/neutral-40
-                                                       theme))}]])]]))
+      :accessibility-label :disclaimer-touchable-opacity
+      :style               (merge container-style (style/container blur? theme))}
+     [selectors/view
+      {:type                :checkbox
+       :accessibility-label accessibility-label
+       :blur?               blur?
+       :checked?            checked?
+       :on-change           on-change
+       :customization-color customization-color}]
+     [text/text
+      {:size  :paragraph-2
+       :style style/text}
+      label]
+     (when icon
+       [rn/view {:style style/icon-container}
+        [icons/icon icon
+         {:accessibility-label :disclaimer-icon
+          :color               (if blur?
+                                 (colors/white-opa-70)
+                                 (colors/theme-colors colors/neutral-50
+                                                      colors/neutral-40
+                                                      theme))}]])]))
@@ -39,7 +39,7 @@
  [customization-color pressed? theme]
  (when pressed?
    (if customization-color
-      (colors/custom-color (or customization-color :blue) 60)
+      (colors/resolve-color (or customization-color :blue) nil)
      (colors/theme-colors colors/primary-50 colors/primary-60 theme))))

 (defn container-outer
@@ -12,11 +12,11 @@
        on-press-out           (fn []
                                 (set-pressed (not pressed?))
                                 (when on-press-out (on-press-out pressed?)))]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:accessibility-label :selector-filter
-      :on-press-out        on-press-out}
-     [rn/view {:style (style/container-outer customization-color pressed? theme)}
-      [rn/view {:style (style/container-inner pressed? blur? theme)}
-       [icon/icon :i/unread
-        {:color (style/icon-color pressed? theme)
-         :size  20}]]]]))
+      :on-press-out        on-press-out
+      :style               (style/container-outer customization-color pressed? theme)}
+     [rn/view {:style (style/container-inner pressed? blur? theme)}
+      [icon/icon :i/unread
+       {:color (style/icon-color pressed? theme)
+        :size  20}]]]))
@@ -24,7 +24,7 @@

 (defn- card-footer
  [{:keys [active? label on-toggle theme]}]
-  [rn/touchable-without-feedback
+  [rn/pressable
   [rn/view {:style (style/card-footer theme)}
    [rn/view {:style style/card-footer-label-container}
     [text/text {:size :paragraph-2} label]]
@@ -54,22 +54,22 @@
    :or   {icon    :i/world
           active? false}}]
  (let [theme (quo.theme/use-theme)]
-    [rn/touchable-without-feedback
+    [rn/pressable
     {:on-press            on-select
      :accessibility-label :privacy-option-card
-      :testID              :privacy-option-card}
-     [rn/view (style/privacy-option-card active? theme)
-      [card-header
-       {:theme   theme
-        :active? active?
-        :icon    icon
-        :label   header}]
-      [unordered-list
-       {:theme           theme
-        :container-style (when-not footer {:margin-bottom 8})} list-items]
-      (when footer
-        [card-footer
-         {:theme     theme
-          :active?   active?
-          :label     footer
-          :on-toggle on-toggle}])]]))
+      :testID              :privacy-option-card
+      :style               (style/privacy-option-card active? theme)}
+     [card-header
+      {:theme   theme
+       :active? active?
+       :icon    icon
+       :label   header}]
+     [unordered-list
+      {:theme           theme
+       :container-style (when-not footer {:margin-bottom 8})} list-items]
+     (when footer
+       [card-footer
+        {:theme     theme
+         :active?   active?
+         :label     footer
+         :on-toggle on-toggle}])]))
@@ -61,35 +61,35 @@
                                                :blur?    blur?
                                                :disabled disabled
                                                :active   active})]
-    [rn/touchable-without-feedback
+    [rn/pressable
     (merge {:disabled            disabled
-             :accessibility-label accessibility-label}
+             :accessibility-label accessibility-label
+             :style               style/container}
            (when on-press
              {:on-press (fn []
                           (on-press id))}))
-     [rn/view {:style style/container}
-      (when show-notification-dot?
-        [notification-dot/view
-         {:style               style/notification-dot
-          :customization-color customization-color}])
-      [rn/view
-       {:style (merge
-                (style/tab
-                 {:size                   size
-                  :background-color       (if (and segmented? (not active))
-                                            :transparent
-                                            background-color)
-                  :disabled               disabled
-                  :segmented?             segmented?
-                  :show-notification-dot? show-notification-dot?})
-                (if active active-item-container-style item-container-style))}
-       (when before
-         [rn/view
-          [icons/icon before {:color icon-color}]])
-       [content {:size size :label label} children]]
-      (when show-notification-dot?
-        [right-side-with-cutout
-         {:width            (style/size->padding-left size)
-          :height           size
-          :disabled         disabled
-          :background-color background-color}])]]))
+     (when show-notification-dot?
+       [notification-dot/view
+        {:style               style/notification-dot
+         :customization-color customization-color}])
+     [rn/view
+      {:style (merge
+               (style/tab
+                {:size                   size
+                 :background-color       (if (and segmented? (not active))
+                                           :transparent
+                                           background-color)
+                 :disabled               disabled
+                 :segmented?             segmented?
+                 :show-notification-dot? show-notification-dot?})
+               (if active active-item-container-style item-container-style))}
+      (when before
+        [rn/view
+         [icons/icon before {:color icon-color}]])
+      [content {:size size :label label} children]]
+     (when show-notification-dot?
+       [right-side-with-cutout
+        {:width            (style/size->padding-left size)
+         :height           size
+         :disabled         disabled
+         :background-color background-color}])]))
@@ -21,17 +21,16 @@
           accessibility-label type labelled?]
    :or   {size 32}}
   children]
-  [rn/touchable-without-feedback
+  [rn/pressable
   (merge {:disabled            disabled?
-           :accessibility-label accessibility-label}
+           :accessibility-label accessibility-label
+           :style               (style-container size
+                                                 disabled?
+                                                 border-color
+                                                 border-width
+                                                 background-color
+                                                 labelled?
+                                                 type)}
          (when on-press
            {:on-press #(on-press id)}))
-   [rn/view
-    {:style (merge (style-container size
-                                    disabled?
-                                    border-color
-                                    border-width
-                                    background-color
-                                    labelled?
-                                    type))}
-    children]])
+   children])
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ulises M	56962fde77	WIP 2	2025-01-30 10:16:29 -06:00
Ulises M	248bd853a8	WIP: Testing alias from status-go	2025-01-29 21:17:14 -06:00
Yevheniia Berdnyk	fa20d4d9c3	e2e: added wallet tests for send and swap flows on mainnet	2025-01-29 18:32:03 +02:00
Parvesh Monu	dd26fcf42c	Add Documentation drawer on Check your Keycard screen (#21997 )	2025-01-29 19:25:34 +05:30
Lungu Cristian	8ac9cc08e1	Keycard signing for dapp interactions (#21785 ) * feat: wip dapps signing with keycard Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: hide the pin sheet before showing the connection sheet Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: signing dapp request with password Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: logic for getting the current dapp Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: issues after endpoints update Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * feat: removed support for eth_sign and signTransaction Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: removed unused event Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * feat: re-enable dapps interactions with keycard Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: adapted to latest standard-auth changes Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * feat: enable connected dapps for keycard Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * ref: removed threading (->) Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: get keycard keypair addresses manually Signed-off-by: Cristian Lungu <lungucristian95@gmail.com> * fix: wrong condition on utils/keycard-address? --------- Signed-off-by: Cristian Lungu <lungucristian95@gmail.com>	2025-01-28 17:33:34 +02:00
Siddarth Kumar	c1230319e1	nix: add fake git to status-go build derivation (#21989 ) This commit adds a script that overrides `git` to echo version required by `status-go` derivation. Also fixes error messages like this when building `status-go` : ``` fatal: not a git repository (or any of the parent directories): .git ``` These messages can be often misleading to some developers.	2025-01-27 18:14:27 +05:30
Lungu Cristian	1e48442d67	Fix dapps transactions instantly rejected (#21973 ) * fix: upgraded status-go to fixed version https://github.com/status-im/status-go/compare/4ec885a9...a2588ee5 * fix: use status-go develop branch https://github.com/status-im/status-go/compare/4ec885a9...e71fdbc6 * build: using status-go v9.3.0 https://github.com/status-im/status-go/compare/4ec885a9...bec0c373	2025-01-27 13:20:40 +02:00
Sean Hagstrom	94fbbbcb3c	fix: resolve UI glitches for chat, contacts, and keycard (#21946 ) This change resolves some issues related to text-overflow in the app, and it also ensures we use the correct drawer title when editing a user nickname.	2025-01-24 15:51:46 +00:00
Yevheniia Berdnyk	4dfd616583	e2e: additional logging for errors in tests	2025-01-23 12:46:55 +02:00
Parvesh Monu	85d00e47af	Keycard - Import a seed phrase into a new Keycard (#21947 )	2025-01-23 12:23:33 +05:30
Ulises Manuel	438fd7a512	fix(chat): Same QR shown code for everyone in the `Contacts` tab (#21949 )	2025-01-22 15:26:15 -06:00
Mohsen	ee5f73f5ee	[#21919 ] fix: remove on-ramp provider description and reinstate mecuryo (#21923 ) * [#21919] fix: remove on-ramp provider description and reinstate mecuryo https://github.com/status-im/status-go/compare/59caca61...07d07601 * [#21919] fix: rebase status-go https://github.com/status-im/status-go/compare/4ec885a9...41743c6c	2025-01-22 17:59:08 +03:00
Volodymyr Kozieiev	b49c0ae58a	Fix local re-frisk launch (#21972 )	2025-01-22 14:43:26 +00:00
Yevheniia Berdnyk	f474edf67d	e2e: fix for saving logs	2025-01-22 16:03:54 +02:00
Volodymyr Kozieiev	dfd90617bf	Backend server doc added to readme (#21966 )	2025-01-21 12:14:27 +00:00
Yevheniia Berdnyk	9782ba2ac3	e2e: added verifications to fallback test	2025-01-21 11:54:44 +02:00
Brian Sztamfater	f0e0c95fe0	feat: integrate base chain (#21876 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2025-01-21 01:44:02 -03:00
Mohsen	ef7d977299	[#21305 ] fix: sort assets by value and collectibles by name (#21908 ) * [#21305] fix: sort assets by value and collectibles by name * [#21305] fix: use seq to check name is nil or empty * [#21305] fix: normalize text to sort properly	2025-01-20 19:41:40 +03:00
Parvesh Monu	70a5ed255f	fix keycard sign up ui issues (#21938 )	2025-01-20 17:22:13 +05:30
flexsurfer	be1347346c	[#21578 ] Keycard - Factory reset a Keycard (#21914 )	2025-01-20 12:35:06 +01:00
Volodymyr Kozieiev	803e83ae02	Screens for editing transaction settings (#21838 ) * Screens for editing transaction settings * extra lines removed * review notes fixed	2025-01-20 11:21:55 +00:00
Yevheniia Berdnyk	64748c939b	e2e: fix for test_community_mentions_push_notification	2025-01-20 03:33:27 +02:00
Sean Hagstrom	64fb344197	chore: add support for remote devices with re-frisk server (#21805 ) This changes adds support for connecting remotely to re-frisk when running the app on a mobile device. This change is essentially aimed towards better support for introspecting on iOS devices, but these changes should also work for Android devices too. Note, that running in the Android simulator may still require port-forwarding with `adb reverse`.	2025-01-18 05:57:17 +00:00
Sean Hagstrom	f27b402205	chore: update status-go with identity images fixes (#21931 ) This change integrates status-go changes that fix an underlying issue with generating identity images. Now identity images will be generated with a populated `clock` field, so we no longer need our existing workaround.	2025-01-18 05:37:37 +00:00
Icaro Motta	b22744f81e	fix(settings): Show current mailserver in legacy settings (#21901 ) A regression removed more code than we wanted in https://github.com/status-im/status-mobile/pull/20730 and the result was broken functionality in the Legacy settings. We now show the current mailserver correctly. The data is kept in sync via signals, just as the original code. Fixes https://github.com/status-im/status-mobile/issues/21375	2025-01-17 14:26:20 -03:00
Mohamed Javid	174e44c77d	fix(wallet)_: Dismiss collectible details screen after a is TX placed (#21909 ) This commit fixes the user is not taken to the activity tab after the TX is placed if the user enters the send flow from collectible details screen (inside the account) Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2025-01-16 21:57:06 +05:30
Mohsen	35c5d5ae6a	[#21853 ] fix: unregister event listener after logout (#21873 ) * [#21853] fix: check deeplink pending request after wallet connect loaded * [#21853] fix: isolate the usage of pending deeplink url * [#21853] fix: remove redundant check for web3 object * [#21853] fix: unregister event listener after logout * [#21853] fix: extract handler	2025-01-15 20:33:31 +03:00
frank	ae00ecb3e0	ci: support long awaited Xcode 16 (#21345 )	2025-01-15 18:49:51 +05:30
flexsurfer	8687282d63	[#21836 ] Relative derivation paths are not supported by keycard (#21888 )	2025-01-15 12:27:51 +01:00
frank	04a97faa43	chore_: remove EncodeTransfer/EncodeFunctionCall/VerifyAccountPassword (#21925 )	2025-01-15 17:52:30 +08:00
Parvesh Monu	91d3cd8da8	fix "keycard is not empty" screen shown if keycard moved during create profile flow (#21918 )	2025-01-15 13:14:32 +05:30
Parvesh Monu	e1a7146f4c	fix Keyboard overlaps suggestion bar and validation errors (#21917 )	2025-01-15 12:57:35 +05:30
Sean Hagstrom	5dc1bfe03b	chore: cleanup event definitions and tests for contact-requests and deleting messages (#21885 ) * chore: add error logging events and effects * chore: restructure tests and effects for delete-message-for-me * chore: refactor events and effects and tests for chat-contacts * chore: refactor and add tests for accepting and declining contact request * chore: refactor chat-contacts rf/defn to defn * chore: add :fx key as a mergeable effect for rf/merge when running tests * chore: refactor rf/defn and add tests for delete-message-for-me * chore: remove log effects for contacts * chore: remove logs effects for delete-message-for-me * fix: update chat usage of sync-all * fix: resolve schema error with missing action-label for contact-request dismissed state * fix: ensure chat-contacts event error handlers are compatible with re-frame * fix: ensure delete-message-for-me event error handlers are compatible with re-frame * chore: refactor and test delete-message events * chore: refactor log events and effects * chore: use log effect in delete-message * chore: use log events and effects inside chat-contacts * chore: use log effects inside delete-message-for-me * chore: remove unneeded test for delete-message-for-me * chore: format bottom-drawer component * chore: format delete-message * chore: format delete-message-for-me	2025-01-14 14:41:47 +00:00
Mohamed Javid	2d8ba41d89	fix(wallet)_: General send flow for saved address and scanned address (#21899 ) This commit: - fixes send flow from saved addresses - adds back send flow from general QR scanner Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2025-01-14 17:57:21 +05:30
Sean Hagstrom	457ed15e0b	chore: resolve deprecation warnings related to `custom-color` and `touchable-without-feeback` (#21874 ) This change refactors the codebase to avoid using deprecated functions and components related to the `custom-color` function (now removed) and the touchable-without-feedback component.	2025-01-14 12:09:49 +00:00
Alexander	c11cf22bbb	2.32.x: Update metadata for F-Droid (#21912 ) * 2.32.x: Update metadata for F-Droid * Rollback	2025-01-14 11:43:11 +01:00
Siddarth Kumar	6ffdaa4e25	nix: fix warnings and upgrade to 2.24.11 (#21547 ) These warnings are fixed: ``` warning: ignoring the client-specified setting 'keep-derivations', because it is a restricted setting and you are not a trusted user warning: ignoring the client-specified setting 'keep-outputs', because it is a restricted setting and you are not a trusted user warning: ignoring the client-specified setting 'sandbox', because it is a restricted setting and you are not a trusted user warning: ignoring the client-specified setting 'stalled-download-timeout', because it is a restricted setting and you are not a trusted user warning: ignoring the client-specified setting 'trusted-public-keys', because it is a restricted setting and you are not a trusted user warning: ignoring the client-specified setting 'trusted-substituters', because it is a restricted setting and you are not a trusted user ```	2025-01-14 09:42:14 +05:30
flexsurfer	f56bd54fd3	[#21915 ] Wrong address generated after creation a new keypair (#21921 )	2025-01-13 17:06:59 +01:00
Sean HagstromandAlexander	394648b377	fix: use image clock when updating profile images to cause re-render (#21795 ) (#21830 ) Co-authored-by: Alexander <alwxndr@gmail.com>	2025-01-10 15:01:57 +01:00
Yevheniia Berdnyk	22a606cbab	e2e: additional fix for requirements	2025-01-10 14:03:23 +02:00
Sean HagstromandAlexander	1b30b3be80	chore: update legal-docs submodule and resources with updated terms-of-use (#21821 ) (#21832 ) Co-authored-by: Alexander <alwxndr@gmail.com>	2025-01-10 12:27:10 +01:00
Yevheniia Berdnyk	10434b53e0	e2e: fix for requirements and getting username	2025-01-10 03:14:31 +02:00
flexsurfer	0472523a7f	[#21652 ] The main part of a backup flow is missing at Keycard migrati… (#21893 )	2025-01-09 19:20:45 +01:00
Volodymyr Kozieiev	770963447a	Simplified pull request template (#21900 )	2025-01-09 13:48:10 +00:00
Parvesh Monu	874aa9866d	On-boarding: re add bio-metric screen to syncing flow (#21890 )	2025-01-09 18:22:37 +05:30
Ulises Manuel	32a3f85694	fix(avatars) - Blinking all over the app and improvement in UX (#21782 ) * Change multiple uses of `merge` to `assoc` in flat-list wrapper * Fix fast-image wrapper to avoid blinking * merge -> assoc usage in chat-item component * Fix avatar not being updated when the user changes their username * Fix scalable avatar issues - On Android, the border was inconsistent depending on the theme. - Fix animation, simplify the calculation, and now it matches designs * Avoid blinking by using rn/memo	2025-01-08 18:16:19 -06:00
Volodymyr Kozieiev	b88bbda3c5	Reverted some code after cleanup (#21892 )	2025-01-08 11:32:44 +00:00
flexsurfer	fad5119ceb	[#21825 ] [Android] Java error at the and of faild Migration to a Keycard flow (#21889 )	2025-01-08 11:47:53 +01:00
Parvesh Monu	3697f63ab0	Fix syncing flow navigation and designs (#21884 )	2025-01-08 11:22:19 +05:30