stash more changes

android/gradle.properties

@@ -54,7 +54,7 @@ commitHash=unknown
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

ios/Podfile

@@ -5,7 +5,7 @@ require Pod::Executable.execute_command('node', ['-p',
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 
-platform :ios, min_ios_version_supported
+platform :ios, 13.0
 prepare_react_native_project!
 
 linkage = ENV['USE_FRAMEWORKS']
@@ -32,7 +32,7 @@ abstract_target 'Status' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    :hermes_enabled => false,
+    :hermes_enabled => true,
     :fabric_enabled => flags[:fabric_enabled],
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
@@ -67,6 +67,7 @@ abstract_target 'Status' do
     # necessary for ios simulators
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
         config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
         # fix for no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
         # ref : https://github.com/facebook/react-native/issues/37748

ios/StatusIm.xcodeproj/project.pbxproj

@@ -44,8 +44,6 @@
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */; };
-		9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -60,7 +58,6 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,14 +105,12 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,24 +118,18 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
-		A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
-		ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -153,7 +142,6 @@
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +149,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +161,6 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +174,6 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +299,6 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
-				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +306,6 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */,
-				668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */,
-				59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */,
-				A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +317,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +335,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +355,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,28 +514,6 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
-		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -594,116 +542,6 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -765,7 +603,6 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -802,7 +639,6 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -835,7 +671,6 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -915,7 +750,6 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -988,7 +822,6 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1065,7 +898,6 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";

nix/mobile/ios/shells/cocoapods.nix

@@ -16,7 +16,7 @@ in mkShell {
       else
         # CocoaPods are trash and can't handle other pod instances running
         ./scripts/wait-for.sh 240 'pod install'
-        (cd ios && pod install)
+        (cd ios && RCT_NEW_ARCH_ENABLED=1 pod install)
       fi
     }
     popd > /dev/null

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
     "@react-native-async-storage/async-storage": "1.19.3",
-    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
+    "@react-native-camera-roll/camera-roll": "7.2.0",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
     "@react-native-community/clipboard": "^1.2.2",
@@ -41,7 +41,7 @@
     "react-native-draggable-flatlist": "4.0.1",
     "react-native-fast-image": "^8.5.11",
     "react-native-fs": "^2.14.1",
-    "react-native-gesture-handler": "2.6.1",
+    "react-native-gesture-handler": "2.12.0",
     "react-native-gifted-charts": "^1.3.2",
     "react-native-haptic-feedback": "^1.9.0",
     "react-native-hole-view": "3.0.0-alpha3",
@@ -58,7 +58,7 @@
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "3.8.0",
     "react-native-randombytes": "^3.6.1",
-    "react-native-reanimated": "3.5.4",
+    "react-native-reanimated": "3.6.1",
     "react-native-redash": "18.1.0",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^8.2.2",

shadow-cljs.edn

@@ -155,7 +155,7 @@
                                       ;; setupFilesAfterEnv.
                                       status-im2.setup.schema-preload
 
-                                      ;;quo.core-spec
+                                      quo.core-spec
                                       status-im2.core-spec]
                    :ns-regexp        "component-spec$"
                    :output-dir       "component-spec"

src/quo/components/list_items/token_value/component_spec.cljs

@@ -7,7 +7,6 @@
   (h/test "Token label renders"
     (h/render [token-value/view
                {:token               :snt
-                :token-name          "Status"
                 :state               :default
                 :status              :empty
                 :customization-color :blue
@@ -21,7 +20,6 @@
   (h/test "Status change"
     (h/render [token-value/view
                {:token               :snt
-                :token-name          "Status"
                 :state               :default
                 :status              :positive
                 :customization-color :blue

src/quo/components/list_items/token_value/view.cljs

@@ -6,6 +6,7 @@
     [quo.components.markdown.text :as text]
     [quo.components.utilities.token.view :as token]
     [quo.foundations.colors :as colors]
+    [quo.foundations.common :as common]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]))
@@ -13,8 +14,7 @@
 (defn- internal-view
   []
   (let [state (reagent/atom :default)]
-    (fn [{:keys [theme customization-color status token metrics? values on-press on-long-press
-                 token-name]}]
+    (fn [{:keys [theme customization-color status token metrics? values on-press on-long-press]}]
       (let [bg-opacity                                                      (case @state
                                                                               :active  10
                                                                               :pressed 5
@@ -36,7 +36,7 @@
                    :flex           1}}
           [token/view {:token token :size :size-32}]
           [rn/view {:style {:margin-left 8}}
-           [text/text {:weight :semi-bold} token-name]
+           [text/text {:weight :semi-bold} (common/token-label token)]
            [text/text
             {:size  :paragraph-2
              :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}

src/quo/components/utilities/token/view.cljs

@@ -1,11 +1,8 @@
 (ns quo.components.utilities.token.view
-  (:require
-    [clojure.string :as string]
-    [quo.components.markdown.text :as quo]
-    [quo.components.utilities.token.loader :as token-loader]
-    [react-native.core :as rn]
-    [schema.core :as schema]
-    [utils.number]))
+  (:require [quo.components.utilities.token.loader :as token-loader]
+            [react-native.core :as rn]
+            [schema.core :as schema]
+            [utils.number]))
 
 (def ?schema
   [:=>
@@ -36,18 +33,6 @@
 
 (def ^:private b64-png-image-prefix "data:image/png;base64,")
 
-(defn temp-empty-symbol
-  [token size]
-  [rn/view
-   {:style (token-style {:justify-content :center
-                         :align-items     :center
-                         :border-radius   20
-                         :border-width    1
-                         :border-color    :grey}
-                        size)}
-   [quo/text {:style {:color :grey}}
-    (string/capitalize (first (name token)))]])
-
 (defn view-internal
   "Render a token image.
    Props:
@@ -66,10 +51,8 @@
                      (str b64-png-image-prefix image-source)
                      image-source)
         source     (or b64-string (token-loader/get-token-image token))]
-    (if source
-      [rn/image
-       {:style  (token-style style size)
-        :source source}]
-      [temp-empty-symbol token size])))
+    [rn/image
+     {:style  (token-style style size)
+      :source source}]))
 
 (def view (schema/instrument #'view-internal ?schema))

src/quo/foundations/common.cljs

@@ -3,3 +3,8 @@
 (def currency-label
   {:eur "€"
    :usd "$"})
+
+(def token-label
+  {:eth "Ethereum"
+   :snt "Status"
+   :dai "Dai"})

src/status_im/chat/models/loading.cljs

@@ -178,7 +178,7 @@
         (when (or first-request cursor)
           (merge
            {:db (assoc-in db [:pagination-info chat-id :loading-messages?] true)}
-           {:utils/dispatch-later [{:ms 100 :dispatch [:reactions/load-more cursor chat-id]}]}
+           {:utils/dispatch-later [{:ms 100 :dispatch [:load-more-reactions cursor chat-id]}]}
            (data-store.messages/messages-by-chat-id-rpc
             chat-id
             cursor

src/status_im/chat/models/reactions.cljs

@@ -0,0 +1,116 @@
+(ns status-im.chat.models.reactions
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.data-store.reactions :as data-store.reactions]
+    [status-im2.constants :as constants]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]
+    [utils.transforms :as transforms]))
+
+(defn update-reaction
+  [acc retracted chat-id message-id emoji-id emoji-reaction-id reaction]
+  ;; NOTE(Ferossgp): For a better performance, better to not keep in db all retracted reactions
+  ;; retraction will always come after the reaction so there shouldn't be a conflict
+  (if retracted
+    (update-in acc [chat-id message-id emoji-id] dissoc emoji-reaction-id)
+    (assoc-in acc [chat-id message-id emoji-id emoji-reaction-id] reaction)))
+
+(defn process-reactions
+  [_]
+  (fn [reactions new-reactions]
+    ;; TODO(Ferossgp): handling own reaction in subscription could be expensive,
+    ;; for better performance we can here separate own reaction into 2 maps
+    (reduce
+     (fn [acc
+          {:keys [chat-id message-id emoji-id emoji-reaction-id retracted]
+           :as   reaction}]
+       (update-reaction acc retracted chat-id message-id emoji-id emoji-reaction-id reaction))
+     reactions
+     new-reactions)))
+
+(defn- earlier-than-deleted-at?
+  [{:keys [db]} {:keys [chat-id clock-value]}]
+  (let [{:keys [deleted-at-clock-value]}
+        (get-in db [:chats chat-id])]
+    (>= deleted-at-clock-value clock-value)))
+
+(rf/defn receive-signal
+  [{:keys [db] :as cofx} reactions]
+  (let [reactions (filter (partial earlier-than-deleted-at? cofx) reactions)]
+    {:db (update db :reactions (process-reactions (:chats db)) reactions)}))
+
+(rf/defn load-more-reactions
+  {:events [:load-more-reactions]}
+  [{:keys [db]} cursor chat-id]
+  (when-let [session-id (get-in db [:pagination-info chat-id :messages-initialized?])]
+    (data-store.reactions/reactions-by-chat-id-rpc
+     chat-id
+     cursor
+     constants/default-number-of-messages
+     #(re-frame/dispatch [::reactions-loaded chat-id session-id %])
+     #(log/error "failed loading reactions" chat-id %))))
+
+(rf/defn reactions-loaded
+  {:events [::reactions-loaded]}
+  [{db :db}
+   chat-id
+   session-id
+   reactions]
+  (when-not (and (get-in db [:pagination-info chat-id :messages-initialized?])
+                 (not= session-id
+                       (get-in db [:pagination-info chat-id :messages-initialized?])))
+    (let [reactions-w-chat-id (map #(assoc % :chat-id chat-id) reactions)]
+      {:db (update db :reactions (process-reactions (:chats db)) reactions-w-chat-id)})))
+
+(defn message-reactions
+  [current-public-key reactions]
+  (reduce
+   (fn [acc [emoji-id reactions]]
+     (if (pos? (count reactions))
+       (let [own (first (filter (fn [[_ {:keys [from]}]]
+                                  (= from current-public-key))
+                                reactions))]
+         (conj acc
+               {:emoji-id          emoji-id
+                :own               (boolean (seq own))
+                :emoji-reaction-id (:emoji-reaction-id (second own))
+                :quantity          (count reactions)}))
+       acc))
+   []
+   reactions))
+
+(defn- <-rpc
+  [{compressed-key :compressedKey
+    emoji-id       :emojiId
+    :keys          [from]}]
+  {:compressed-key compressed-key
+   :emoji-id       emoji-id
+   :from           from})
+
+(defn- format-response
+  [response]
+  (->> (transforms/js->clj response)
+       (map <-rpc)
+       (group-by :emoji-id)))
+
+(rf/defn save-emoji-reaction-details
+  {:events [:chat/save-emoji-reaction-details]}
+  [{:keys [db]} reaction-authors]
+  {:db (assoc db :chat/reactions-authors reaction-authors)})
+
+(rf/defn clear-emoji-reaction-details
+  {:events [:chat/clear-emoji-reaction-author-details]}
+  [{:keys [db]}]
+  {:db (dissoc db :chat/reactions-authors)})
+
+(rf/defn emoji-reactions-by-message-id
+  {:events [:chat.ui/emoji-reactions-by-message-id]}
+  [{:keys [db]} {:keys [message-id on-success]}]
+  {:db            (dissoc db :chat/reactions-authors)
+   :json-rpc/call [{:method      "wakuext_emojiReactionsByChatIDMessageID"
+                    :params      [(:current-chat-id db) message-id]
+                    :js-response true
+                    :on-error    #(log/error "failed to fetch emoji reaction by message-id: "
+                                             {:message-id message-id :error %})
+                    :on-success  #(when on-success
+                                    (on-success (format-response %)))}]})

src/status_im/data_store/reactions.cljs

@@ -0,0 +1,34 @@
+(ns status-im.data-store.reactions
+  (:require
+    [clojure.set :as set]))
+
+(defn ->rpc
+  [message]
+  (-> message
+      (set/rename-keys {:message-id        :messageId
+                        :emoji-id          :emojiId
+                        :chat-id           :localChatId
+                        :message-type      :messageType
+                        :emoji-reaction-id :id})))
+
+(defn <-rpc
+  [message]
+  (-> message
+      (dissoc :chat_id)
+      (set/rename-keys {:messageId   :message-id
+                        :localChatId :chat-id
+                        :emojiId     :emoji-id
+                        :messageType :message-type
+                        :id          :emoji-reaction-id})))
+
+(defn reactions-by-chat-id-rpc
+  [chat-id
+   cursor
+   limit
+   on-success
+   on-error]
+  {:json-rpc/call [{:method     "wakuext_emojiReactionsByChatID"
+                    :params     [chat-id cursor limit]
+                    :on-success (fn [result]
+                                  (on-success (map <-rpc result)))
+                    :on-error   on-error}]})

src/status_im/ui/screens/advanced_settings/views.cljs

@@ -19,8 +19,7 @@
            transactions-management-enabled?
            wakuv2-flag
            current-fleet
-           webview-debug
-           test-networks-enabled?]}]
+           webview-debug]}]
   (keep
    identity
    [{:size :small
@@ -101,14 +100,6 @@
        [:profile.settings/change-webview-debug (not webview-debug)])
      :accessory :switch
      :active webview-debug}
-    {:size :small
-     :title "Testnet mode"
-     :accessibility-label :test-networks-enabled
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-test-networks])
-     :accessory :switch
-     :active test-networks-enabled?}
     {:size :small
      :title (i18n/label :t/waku-bloom-filter-mode)
      :accessibility-label :waku-bloom-filter-mode-settings-switch
@@ -137,8 +128,7 @@
 
 (views/defview advanced-settings
   []
-  (views/letsubs [{:keys [webview-debug
-                          test-networks-enabled?]} [:profile/profile]
+  (views/letsubs [{:keys [webview-debug]}          [:profile/profile]
                   network-name                     [:network-name]
                   waku-bloom-filter-mode           [:waku/bloom-filter-mode]
                   wakuv2-flag                      [:waku/v2-flag]
@@ -154,7 +144,6 @@
                    :dev-mode?                        false
                    :wakuv2-flag                      wakuv2-flag
                    :waku-bloom-filter-mode           waku-bloom-filter-mode
-                   :webview-debug                    webview-debug
-                   :test-networks-enabled?           test-networks-enabled?})
+                   :webview-debug                    webview-debug})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]))

src/status_im2/common/pairing/events.cljs

@@ -18,8 +18,6 @@
                                                 constants/local-pairing-event-connection-success)
                                              (= action
                                                 constants/local-pairing-action-connect))
-        connection-error?               (and (= type
-                                                constants/local-pairing-event-connection-error))
         error-on-pairing?               (contains? constants/local-pairing-event-errors type)
         completed-pairing?              (and (= type
                                                 constants/local-pairing-event-transfer-success)
@@ -32,9 +30,8 @@
                                              (and (some? account) (some? password)))
         multiaccount-data               (when received-account?
                                           (merge account {:password password}))
-        navigate-to-syncing-devices?    (and (or connection-success? connection-error?) receiver?)
+        navigate-to-syncing-devices?    (and (or connection-success? error-on-pairing?) receiver?)
         user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
-                                            (= (:view-id db) :profiles)
                                             (= (:view-id db) :syncing-progress-intro))
         user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
     (merge {:db (cond-> db

src/status_im2/common/resources.cljs

@@ -47,7 +47,6 @@
    :no-contacts-to-invite-dark    (js/require "../resources/images/ui2/no-contacts-to-invite-dark.png")
    :no-notifications-light        (js/require "../resources/images/ui2/no-notifications-light.png")
    :no-notifications-dark         (js/require "../resources/images/ui2/no-notifications-dark.png")
-   :notifications                 (js/require "../resources/images/ui2/notifications.png")
    :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")})
 
 (def ui-themed
@@ -139,11 +138,7 @@
                    (js/require "../resources/videos2/biometrics_04.mp4")]
    :generate-keys [(js/require "../resources/videos2/generating_keys_01.mp4")
                    (js/require "../resources/videos2/generating_keys_02.mp4")
-                   (js/require "../resources/videos2/generating_keys_03.mp4")]
-   :notifications [(js/require "../resources/videos2/notifications_01.mp4")
-                   (js/require "../resources/videos2/notifications_02.mp4")
-                   (js/require "../resources/videos2/notifications_03.mp4")
-                   (js/require "../resources/videos2/notifications_04.mp4")]})
+                   (js/require "../resources/videos2/generating_keys_03.mp4")]})
 
 (def services
   {:latamex (js/require "../resources/images/services/Latamex.png")

src/status_im2/config.cljs

@@ -157,4 +157,6 @@
 
 (def default-kdf-iterations 3200)
 
+(def shell-navigation-disabled? false)
+
 (def community-accounts-selection-enabled? false)

src/status_im2/contexts/chat/composer/sub_view.cljs

@@ -4,6 +4,7 @@
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
+    [status-im2.config :as config]
     [status-im2.contexts.chat.composer.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -39,6 +40,8 @@
       [quo/floating-shell-button
        {:jump-to
         {:on-press            (fn []
+                                (when config/shell-navigation-disabled?
+                                  (rf/dispatch [:chat/close true]))
                                 (rf/dispatch [:shell/navigate-to-jump-to]))
          :customization-color customization-color
          :label               (i18n/label :t/jump-to)

src/status_im2/contexts/chat/events.cljs

@@ -7,11 +7,11 @@
     [status-im.chat.models.loading :as loading]
     [status-im.data-store.chats :as chats-store]
     [status-im2.common.muting.helpers :refer [format-mute-till]]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
     status-im2.contexts.chat.effects
     status-im2.contexts.chat.lightbox.events
-    status-im2.contexts.chat.messages.content.reactions.events
     [status-im2.contexts.chat.messages.delete-message-for-me.events :as delete-for-me]
     [status-im2.contexts.chat.messages.delete-message.events :as delete-message]
     [status-im2.contexts.chat.messages.list.state :as chat.state]
@@ -167,7 +167,7 @@
 
 (rf/defn close-chat
   {:events [:chat/close]}
-  [{:keys [db] :as cofx}]
+  [{:keys [db] :as cofx} navigate-to-shell?]
   (when-let [chat-id (:current-chat-id db)]
     (chat.state/reset-visible-item)
     (rf/merge cofx
@@ -176,7 +176,15 @@
                                                (dissoc :current-chat-id)
                                                (assoc-in [:chat/inputs chat-id :focused?] false))
                 :effects.async-storage/set {:chat-id nil
-                                            :key-uid nil}})
+                                            :key-uid nil}}
+               (let [community-id (get-in db [:chats chat-id :community-id])]
+                 ;; When navigating back from community chat to community, update switcher card
+                 ;; A close chat event is also called while opening any chat.
+                 ;; That might lead to duplicate :dispatch keys in fx/merge, that's why dispatch-n
+                 ;; is used here.
+                 (when (and community-id config/shell-navigation-disabled? (not navigate-to-shell?))
+                   {:dispatch-n [[:shell/add-switcher-card
+                                  :community-overview community-id]]})))
               (link-preview/reset-all)
               (delete-for-me/sync-all)
               (delete-message/send-all)
@@ -210,7 +218,7 @@
             {:dispatch [(if animation :shell/navigate-to :navigate-to) :chat chat-id animation]}
             (when-not (#{:community :community-overview :shell} (:view-id db))
               (navigation/pop-to-root :shell-stack))
-            (close-chat)
+            (close-chat false)
             (force-close-chat chat-id)
             (fn [{:keys [db]}]
               {:db (assoc db :current-chat-id chat-id)})

src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs

@@ -2,6 +2,7 @@
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.shell.jump-to.constants :as jump-to.constants]
     [utils.i18n :as i18n]
@@ -39,6 +40,8 @@
      [quo/floating-shell-button
       {:jump-to
        {:on-press            (fn []
+                               (when config/shell-navigation-disabled?
+                                 (rf/dispatch [:chat/close true]))
                                (rf/dispatch [:shell/navigate-to-jump-to]))
         :customization-color customization-color
         :label               (i18n/label :t/jump-to)}}

src/status_im2/contexts/chat/messages/content/reactions/events.cljs

@@ -1,106 +0,0 @@
-(ns status-im2.contexts.chat.messages.content.reactions.events
-  (:require [clojure.set :as set]
-            [status-im2.constants :as constants]
-            [taoensso.timbre :as log]
-            [utils.re-frame :as rf]))
-
-(defn update-reaction
-  [acc retracted chat-id message-id emoji-id emoji-reaction-id reaction]
-  ;; NOTE: For a better performance, better to not keep in db all retracted reactions
-  ;; retraction will always come after the reaction so there shouldn't be a conflict
-  (if retracted
-    (update-in acc [chat-id message-id emoji-id] dissoc emoji-reaction-id)
-    (assoc-in acc [chat-id message-id emoji-id emoji-reaction-id] reaction)))
-
-(defn process-reactions
-  [_]
-  (fn [reactions new-reactions]
-    ;; NOTE: handling own reaction in subscription could be expensive,
-    ;; for better performance we can here separate own reaction into 2 maps
-    (reduce
-     (fn [acc
-          {:keys [chat-id message-id emoji-id emoji-reaction-id retracted]
-           :as   reaction}]
-       (update-reaction acc retracted chat-id message-id emoji-id emoji-reaction-id reaction))
-     reactions
-     new-reactions)))
-
-(defn- earlier-than-deleted-at?
-  [{:keys [db]} {:keys [chat-id clock-value]}]
-  (let [{:keys [deleted-at-clock-value]}
-        (get-in db [:chats chat-id])]
-    (>= deleted-at-clock-value clock-value)))
-
-(rf/defn receive-signal
-  [{:keys [db] :as cofx} reactions]
-  (let [reactions (filter (partial earlier-than-deleted-at? cofx) reactions)]
-    {:db (update db :reactions (process-reactions (:chats db)) reactions)}))
-
-(defn <-rpc
-  [message]
-  (-> message
-      (dissoc :chat_id)
-      (set/rename-keys {:messageId   :message-id
-                        :localChatId :chat-id
-                        :emojiId     :emoji-id
-                        :messageType :message-type
-                        :id          :emoji-reaction-id})))
-
-(rf/reg-event-fx :reactions/load-more
- (fn [{:keys [db]} [cursor chat-id]]
-   (when-let [session-id (get-in db [:pagination-info chat-id :messages-initialized?])]
-     {:json-rpc/call [{:method     "wakuext_emojiReactionsByChatID"
-                       :params     [chat-id cursor constants/default-number-of-messages]
-                       :on-success #(rf/dispatch [:reactions/loaded chat-id session-id (map <-rpc %)])
-                       :on-error   #(log/error "failed loading reactions" chat-id %)}]})))
-
-(rf/reg-event-fx :reactions/loaded
- (fn [{db :db} [chat-id session-id reactions]]
-   (when-not (and (get-in db [:pagination-info chat-id :messages-initialized?])
-                  (not= session-id
-                        (get-in db [:pagination-info chat-id :messages-initialized?])))
-     (let [reactions-w-chat-id (map #(assoc % :chat-id chat-id) reactions)]
-       {:db (update db :reactions (process-reactions (:chats db)) reactions-w-chat-id)}))))
-
-(defn- format-authors-response
-  [response]
-  (->> response
-       (map (fn [item]
-              {:compressed-key (:compressedKey item)
-               :emoji-id       (:emojiId item)
-               :from           (:from item)}))
-       (group-by :emoji-id)))
-
-(rf/reg-event-fx :reactions/get-authors-by-message-id
- (fn [{:keys [db]} [{:keys [message-id on-success]}]]
-   {:db            (dissoc db :reactions/authors)
-    :json-rpc/call [{:method     "wakuext_emojiReactionsByChatIDMessageID"
-                     :params     [(:current-chat-id db) message-id]
-                     :on-error   #(log/error "failed to fetch emoji reaction by message-id: "
-                                             {:message-id message-id :error %})
-                     :on-success #(when on-success
-                                    (on-success (format-authors-response %)))}]}))
-
-(rf/reg-event-fx :reactions/save-authors
- (fn [{:keys [db]} [reaction-authors]]
-   {:db (assoc db :reactions/authors reaction-authors)}))
-
-(rf/reg-event-fx :reactions/clear-authors
- (fn [{:keys [db]}]
-   {:db (dissoc db :reactions/authors)}))
-
-(rf/reg-event-fx :reactions/send-emoji-reaction
- (fn [{{:keys [current-chat-id]} :db} [{:keys [message-id emoji-id]}]]
-   {:json-rpc/call [{:method      "wakuext_sendEmojiReaction"
-                     :params      [current-chat-id message-id emoji-id]
-                     :js-response true
-                     :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error    #(log/error "failed to send a reaction" %)}]}))
-
-(rf/reg-event-fx :reactions/send-emoji-reaction-retraction
- (fn [_ [emoji-reaction-id]]
-   {:json-rpc/call [{:method      "wakuext_sendEmojiReactionRetraction"
-                     :params      [emoji-reaction-id]
-                     :js-response true
-                     :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error    #(log/error "failed to send a reaction retraction" %)}]}))

src/status_im2/contexts/chat/messages/content/reactions/view.cljs

@@ -17,21 +17,23 @@
 (defn- on-long-press
   [{:keys [message-id emoji-id user-message-content reactions-order theme]}]
   (rf/dispatch
-   [:reactions/get-authors-by-message-id
+   [:chat.ui/emoji-reactions-by-message-id
     {:message-id message-id
      :on-success (fn [response]
-                   (rf/dispatch [:reactions/save-authors
+                   (rf/dispatch [:chat/save-emoji-reaction-details
                                  {:reaction-authors-list response
                                   :selected-reaction     emoji-id}])
                    (rf/dispatch [:dismiss-keyboard])
                    (rf/dispatch [:show-bottom-sheet
-                                 {:on-close                #(rf/dispatch
-                                                             [:reactions/clear-authors])
-                                  :content                 (fn []
-                                                             [drawers/reaction-authors
-                                                              {:reactions-order reactions-order
-                                                               :theme           theme}])
-                                  :selected-item           (fn [] user-message-content)
+                                 {:on-close (fn []
+                                              (rf/dispatch
+                                               [:chat/clear-emoji-reaction-author-details]))
+                                  :content (fn []
+                                             [drawers/reaction-authors
+                                              {:reactions-order reactions-order
+                                               :theme           theme}])
+                                  :selected-item (fn []
+                                                   user-message-content)
                                   :padding-bottom-override 0}]))}]))
 
 (defn- on-press-add

src/status_im2/contexts/chat/messages/drawers/view.cljs

@@ -71,7 +71,7 @@
 (defn reaction-authors
   [{:keys [reactions-order theme]}]
   (let [{:keys [reaction-authors-list
-                selected-reaction]} (rf/sub [:reactions/authors])
+                selected-reaction]} (rf/sub [:chat/reactions-authors])
         selected-tab                (reagent/atom (or selected-reaction
                                                       (first (keys reaction-authors-list))))]
     (fn []

src/status_im2/contexts/chat/messages/list/events.cljs

@@ -5,21 +5,6 @@
     [utils.re-frame :as rf]
     [utils.red-black-tree :as red-black-tree]))
 
-(def is-system-message-content-type?
-  #{constants/content-type-system-text
-    constants/content-type-community
-    constants/content-type-system-message-mutual-event-accepted
-    constants/content-type-system-message-mutual-event-removed
-    constants/content-type-system-message-mutual-event-sent
-    constants/content-type-system-pinned-message})
-
-(defn is-system-message?
-  [content-type message-type]
-  (or
-   (is-system-message-content-type? content-type)
-   (= constants/message-type-private-group-system-message
-      message-type)))
-
 (defn- add-datemark
   [{:keys [whisper-timestamp] :as msg}]
   ;;NOTE(performance) this is slow
@@ -34,7 +19,6 @@
            clock-value
            album-id
            message-type
-           content-type
            from
            outgoing
            whisper-timestamp
@@ -44,10 +28,12 @@
   (-> {:whisper-timestamp whisper-timestamp
        :from              from
        :one-to-one?       (= constants/message-type-one-to-one message-type)
-       :system-message?   (or
-                           (is-system-message? content-type message-type)
-                           deleted?
-                           deleted-for-me?)
+       :system-message?   (boolean
+                           (or
+                            (= constants/message-type-private-group-system-message
+                               message-type)
+                            deleted?
+                            deleted-for-me?))
        :clock-value       clock-value
        :type              :message
        :message-id        message-id

src/status_im2/contexts/chat/messages/list/style.cljs

@@ -1,14 +1,19 @@
 (ns status-im2.contexts.chat.messages.list.style
   (:require
     [quo.foundations.colors :as colors]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [status-im2.config :as config]))
 
 (defonce ^:const cover-height 168)
 (defonce ^:const overscroll-cover-height 2000)
 (defonce ^:const header-avatar-top-offset -36)
 
-(def keyboard-avoiding-container
-  {:flex 1})
+(defn keyboard-avoiding-container
+  [{:keys [top]}]
+  {:position      :relative
+   :flex          1
+   :top           (if config/shell-navigation-disabled? (- top) 0)
+   :margin-bottom (if config/shell-navigation-disabled? (- top) 0)})
 
 (def list-container
   {:padding-vertical 16})

src/status_im2/contexts/chat/messages/navigation/view.cljs

@@ -9,6 +9,7 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [status-im2.common.home.actions.view :as actions]
+    [status-im2.config :as config]
     [status-im2.contexts.chat.messages.list.view :refer [topbar-invisible-scroll-y-value]]
     [status-im2.contexts.chat.messages.navigation.style :as style]
     [status-im2.contexts.chat.messages.pin.banner.view :as pin.banner]
@@ -115,7 +116,10 @@
         :background          :blur
         :size                32
         :accessibility-label :back-button
-        :on-press            #(rf/dispatch [:navigate-back])}
+        :on-press            #(do
+                                (when config/shell-navigation-disabled?
+                                  (rf/dispatch [:chat/close]))
+                                (rf/dispatch [:navigate-back]))}
        back-icon]
       [reanimated/view
        {:style (style/animated-header all-loaded? translate-animation title-opacity-animation)}

src/status_im2/contexts/chat/messages/transport/events.cljs

@@ -4,10 +4,12 @@
     [clojure.string :as string]
     [status-im.browser.core :as browser]
     [status-im.chat.models.message :as models.message]
+    [status-im.chat.models.reactions :as models.reactions]
     [status-im.communities.core :as models.communities]
     [status-im.data-store.activities :as data-store.activities]
     [status-im.data-store.chats :as data-store.chats]
     [status-im.data-store.invitations :as data-store.invitations]
+    [status-im.data-store.reactions :as data-store.reactions]
     [status-im.group-chats.core :as models.group]
     [status-im.multiaccounts.update.core :as update.core]
     [status-im.pairing.core :as models.pairing]
@@ -16,7 +18,6 @@
     [status-im.wallet.core :as wallet]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.events :as chat.events]
-    [status-im2.contexts.chat.messages.content.reactions.events :as reactions]
     [status-im2.contexts.chat.messages.pin.events :as messages.pin]
     [status-im2.contexts.contacts.events :as models.contact]
     [status-im2.contexts.shell.activity-center.events :as activity-center]
@@ -138,7 +139,7 @@
         (js-delete response-js "emojiReactions")
         (rf/merge cofx
                   (process-next response-js sync-handler)
-                  (reactions/receive-signal (map reactions/<-rpc reactions))))
+                  (models.reactions/receive-signal (map data-store.reactions/<-rpc reactions))))
 
       (seq invitations)
       (let [invitations (types/js->clj invitations)]
@@ -385,3 +386,21 @@
                     :on-error    #(do
                                     (log/warn "failed to send a message" %)
                                     (js/alert (str "failed to send a message: " %)))}]})
+
+(rf/defn send-emoji-reaction
+  {:events [:reactions/send-emoji-reaction]}
+  [{{:keys [current-chat-id]} :db} {:keys [message-id emoji-id]}]
+  {:json-rpc/call [{:method      "wakuext_sendEmojiReaction"
+                    :params      [current-chat-id message-id emoji-id]
+                    :js-response true
+                    :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
+                    :on-error    #(log/error "failed to send a reaction" %)}]})
+
+(rf/defn send-retract-emoji-reaction
+  {:events [:reactions/send-emoji-reaction-retraction]}
+  [_ emoji-reaction-id]
+  {:json-rpc/call [{:method      "wakuext_sendEmojiReactionRetraction"
+                    :params      [emoji-reaction-id]
+                    :js-response true
+                    :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
+                    :on-error    #(log/error "failed to send a reaction retraction" %)}]})

src/status_im2/contexts/chat/messages/view.cljs

@@ -49,7 +49,7 @@
     ;; Note - Don't pass `behavior :height` to keyboard avoiding view,. It breaks composer -
     ;; https://github.com/status-im/status-mobile/issues/16595
     [rn/keyboard-avoiding-view
-     {:style                    style/keyboard-avoiding-container
+     {:style                    (style/keyboard-avoiding-container insets)
       :keyboard-vertical-offset (- (:bottom insets))}
 
      [list.view/message-list-content-view

src/status_im2/contexts/communities/discover/view.cljs

@@ -242,7 +242,6 @@
 
 (defn- internal-discover-view
   [params]
-  (rf/dispatch [:fetch-contract-communities])
   [:f> f-view-internal params])
 
 (def view (quo.theme/with-theme internal-discover-view))

src/status_im2/contexts/onboarding/enable_notifications/style.cljs

@@ -1,19 +1,22 @@
-(ns status-im2.contexts.onboarding.enable-notifications.style)
+(ns status-im2.contexts.onboarding.enable-notifications.style
+  (:require
+    [quo.foundations.colors :as colors]))
 
 (def default-margin 20)
 
 (defn page-container
   [insets]
-  {:flex            1
-   :justify-content :space-between
-   :padding-top     (:top insets)})
+  {:flex        1
+   :padding-top (:top insets)})
 
-(defn page-illustration
-  [width]
-  {:flex  1
-   :width width})
-
-(def page-heading {:z-index 1})
+(def page-illustration
+  {:flex              1
+   :background-color  colors/danger-50
+   :align-items       :center
+   :margin-horizontal default-margin
+   :border-radius     20
+   :margin-top        default-margin
+   :justify-content   :center})
 
 (defn buttons
   [insets]

src/status_im2/contexts/onboarding/enable_notifications/view.cljs

@@ -4,9 +4,6 @@
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
-    [status-im2.common.parallax.view :as parallax]
-    [status-im2.common.parallax.whitelist :as whitelist]
-    [status-im2.common.resources :as resources]
     [status-im2.contexts.onboarding.enable-notifications.style :as style]
     [status-im2.contexts.shell.jump-to.utils :as shell.utils]
     [taoensso.timbre :as log]
@@ -38,7 +35,7 @@
                               (rf/dispatch [:navigate-to-within-stack
                                             [:welcome :enable-notifications]]))
        :type                :primary
-       :icon-left           :i/notifications
+       :before              :i/notifications
        :accessibility-label :enable-notifications-button
        :customization-color profile-color}
       (i18n/label :t/intro-wizard-title6)]
@@ -53,36 +50,16 @@
        :container-style     {:margin-top 12}}
       (i18n/label :t/maybe-later)]]))
 
-(defn enable-notifications-parallax
-  []
-  (let [stretch (if rn/small-screen? -40 -25)]
-    [parallax/video
-     {:layers  (:notifications resources/parallax-video)
-      :stretch stretch}]))
-
-(defn enable-notifications-simple
-  []
-  (let [width (:width (rn/get-window))]
-    [rn/image
-     {:resize-mode :contain
-      :style       (style/page-illustration width)
-      :source      (resources/get-image :notifications)}]))
-
-(defn f-enable-notifications
+(defn enable-notifications
   []
   (let [insets (safe-area/get-insets)]
     [rn/view {:style (style/page-container insets)}
-     [rn/view {:style style/page-heading}
-      [quo/page-nav
-       {:background :blur
-        :icon-name  :i/arrow-left
-        :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
-      [page-title]]
-     (if whitelist/whitelisted?
-       [enable-notifications-parallax]
-       [enable-notifications-simple])
+     [quo/page-nav
+      {:background :blur
+       :icon-name  :i/arrow-left
+       :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
+     [page-title]
+     [rn/view {:style style/page-illustration}
+      [quo/text
+       "Illustration here"]]
      [enable-notification-buttons {:insets insets}]]))
-
-(defn view
-  []
-  [:f> f-enable-notifications])

src/status_im2/contexts/onboarding/syncing/progress/view.cljs

@@ -4,7 +4,6 @@
     [react-native.core :as rn]
     [status-im2.contexts.onboarding.common.background.view :as background]
     [status-im2.contexts.onboarding.syncing.progress.style :as style]
-    [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -26,17 +25,12 @@
     :description-accessibility-label :progress-screen-sub-title}])
 
 (defn try-again-button
-  [profile-color in-onboarding? logged-in?]
+  [profile-color in-onboarding?]
   [quo/button
    {:on-press            (fn []
                            (rf/dispatch [:syncing/clear-states])
-                           (cond
-                             logged-in?     (rf/dispatch [:navigate-back])
-                             in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro])
-                             :else          (do
-                                              (rf/dispatch [:navigate-back])
-                                              (debounce/dispatch-and-chill [:open-modal :sign-in]
-                                                                           1000))))
+                           (rf/dispatch [:navigate-back-to
+                                         (if in-onboarding? :sign-in-intro :sign-in)]))
     :accessibility-label :try-again-later-button
     :customization-color profile-color
     :container-style     style/try-again-button}
@@ -45,8 +39,7 @@
 (defn view
   [in-onboarding?]
   (let [pairing-status (rf/sub [:pairing/pairing-status])
-        profile-color  (:color (rf/sub [:onboarding/profile]))
-        logged-in?     (rf/sub [:multiaccount/logged-in?])]
+        profile-color  (:color (rf/sub [:onboarding/profile]))]
     [rn/view {:style (style/page-container in-onboarding?)}
      (when-not in-onboarding? [background/view true])
      [quo/page-nav {:type :no-title :background :blur}]
@@ -57,7 +50,7 @@
        [rn/view {:style style/page-illustration}
         [quo/text "[Error here]"]])
      (when-not (pairing-progress pairing-status)
-       [try-again-button profile-color in-onboarding? logged-in?])]))
+       [try-again-button profile-color in-onboarding?])]))
 
 (defn view-onboarding
   []

src/status_im2/contexts/profile/settings/events.cljs

@@ -4,7 +4,6 @@
             [status-im2.constants :as constants]
             status-im2.contexts.profile.settings.effects
             [taoensso.timbre :as log]
-            [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
 (rf/defn send-contact-update
@@ -15,7 +14,6 @@
                       :on-success #(log/debug "sent contact update")}]}))
 
 (rf/defn profile-update
-  {:events [:profile.settings/profile-update]}
   [{:keys [db] :as cofx}
    setting setting-value
    {:keys [dont-sync? on-success] :or {on-success #()}}]
@@ -58,18 +56,6 @@
             {:profile.settings/webview-debug-changed value}
             (profile-update :webview-debug (boolean value) {})))
 
-(rf/reg-event-fx :profile.settings/toggle-test-networks
- (fn [{:keys [db]}]
-   (let [value      (get-in db [:profile/profile :test-networks-enabled?])
-         on-success #(rf/dispatch [:logout])]
-     {:fx [[:ui/show-confirmation
-            {:title     (i18n/label :t/testnet-mode-prompt-title)
-             :content   (i18n/label :t/testnet-mode-prompt-content)
-             :on-accept #(rf/dispatch [:profile.settings/profile-update :test-networks-enabled?
-                                       (not value)
-                                       {:on-success on-success}])
-             :on-cancel nil}]]})))
-
 (rf/defn change-preview-privacy-flag
   {:events [:profile.settings/change-preview-privacy]}
   [{:keys [db] :as cofx} private?]

src/status_im2/contexts/quo_preview/list_items/token_value.cljs

@@ -20,7 +20,6 @@
 (defn view
   []
   (let [state (reagent/atom {:token               :snt
-                             :token-name          "Status"
                              :state               :default
                              :status              :empty
                              :customization-color :blue

src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs

@@ -5,6 +5,7 @@
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver]
     [status-im2.contexts.shell.jump-to.animation :as animation]
@@ -197,7 +198,13 @@
     (rf/dispatch [:chat/navigate-to-chat id])
 
     (= card-type shell.constants/community-channel-card)
-    (rf/dispatch [:chat/navigate-to-chat channel-id])
+    (if config/shell-navigation-disabled?
+      (do
+        (rf/dispatch [:navigate-to :community-overview id])
+        (js/setTimeout
+         #(rf/dispatch [:chat/navigate-to-chat channel-id])
+         100))
+      (rf/dispatch [:chat/navigate-to-chat channel-id]))
 
     (= card-type shell.constants/community-card)
     (rf/dispatch [:navigate-to :community-overview id])))

src/status_im2/contexts/shell/jump_to/effects.cljs

@@ -1,5 +1,6 @@
 (ns status-im2.contexts.shell.jump-to.effects
   (:require
+    [status-im2.config :as config]
     [status-im2.contexts.shell.jump-to.animation :as animation]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     [status-im2.contexts.shell.jump-to.state :as state]
@@ -14,8 +15,9 @@
 (rf/reg-fx :effects.shell/navigate-to-jump-to
  (fn []
    (animation/close-home-stack false)
-   (some-> ^js @state/jump-to-list-ref
-           (.scrollToOffset #js {:y 0 :animated false}))))
+   (when-not config/shell-navigation-disabled?
+     (some-> ^js @state/jump-to-list-ref
+             (.scrollToOffset #js {:y 0 :animated false})))))
 
 ;; Note - pop-to-root resets currently opened screens to `close-screen-without-animation`.
 ;; This might take some time. So don't directly merge the effect of `pop-to-root` and

src/status_im2/contexts/shell/jump_to/events.cljs

@@ -2,6 +2,7 @@
   (:require
     [status-im.data-store.switcher-cards :as switcher-cards-store]
     [status-im.utils.core :as utils]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     status-im2.contexts.shell.jump-to.effects
@@ -65,10 +66,19 @@
     (when card-data
       (rf/merge
        cofx
-       {:db (assoc-in
-             db
-             [:shell/switcher-cards (:card-id card-data)]
-             switcher-card)}
+       (merge
+        {:db (assoc-in
+              db
+              [:shell/switcher-cards (:card-id card-data)]
+              switcher-card)}
+        (when config/shell-navigation-disabled?
+          {:effects.shell/change-tab (cond
+                                       (#{shell.constants/one-to-one-chat-card
+                                          shell.constants/private-group-chat-card}
+                                        card-type)
+                                       :chats-stack
+
+                                       :else :communities-stack)}))
        (switcher-cards-store/upsert-switcher-card-rpc switcher-card)))))
 
 (rf/defn close-switcher-card
@@ -84,29 +94,32 @@
   {:events [:shell/navigate-to-jump-to]}
   [{:keys [db]}]
   (let [open-floating-screens (shell.utils/open-floating-screens)]
-    {:db
-     (cond-> db
+    (merge
+     (if config/shell-navigation-disabled?
+       {:pop-to-root-fx :shell-stack}
+       {:db
+        (cond-> db
 
-       (get open-floating-screens shell.constants/chat-screen)
-       (assoc-in [:shell/floating-screens shell.constants/chat-screen :animation]
-        shell.constants/close-screen-with-shell-animation)
+          (get open-floating-screens shell.constants/chat-screen)
+          (assoc-in [:shell/floating-screens shell.constants/chat-screen :animation]
+           shell.constants/close-screen-with-shell-animation)
 
-       (and (get open-floating-screens shell.constants/chat-screen)
-            (get open-floating-screens shell.constants/community-screen))
-       (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
-        shell.constants/close-screen-without-animation)
+          (and (get open-floating-screens shell.constants/chat-screen)
+               (get open-floating-screens shell.constants/community-screen))
+          (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
+           shell.constants/close-screen-without-animation)
 
-       (and (not (get open-floating-screens shell.constants/chat-screen))
-            (get open-floating-screens shell.constants/community-screen))
-       (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
-        shell.constants/close-screen-with-shell-animation)
+          (and (not (get open-floating-screens shell.constants/chat-screen))
+               (get open-floating-screens shell.constants/community-screen))
+          (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
+           shell.constants/close-screen-with-shell-animation)
 
-       (get open-floating-screens shell.constants/discover-communities-screen)
-       (assoc-in [:shell/floating-screens shell.constants/discover-communities-screen :animation]
-        shell.constants/close-screen-without-animation))
+          (get open-floating-screens shell.constants/discover-communities-screen)
+          (assoc-in [:shell/floating-screens shell.constants/discover-communities-screen :animation]
+           shell.constants/close-screen-without-animation))
 
-     :dispatch [:set-view-id :shell]
-     :effects.shell/navigate-to-jump-to nil}))
+        :dispatch [:set-view-id :shell]})
+     {:effects.shell/navigate-to-jump-to nil})))
 
 (rf/defn change-shell-status-bar-style
   {:events [:change-shell-status-bar-style]}
@@ -149,8 +162,15 @@
                           (not hidden-screen?)
                           (:current-chat-id db))
                      (conj [:chat/close]))})
-    {:db          (assoc db :view-id go-to-view-id)
-     :navigate-to go-to-view-id}))
+    (merge
+     {:db          (assoc db :view-id go-to-view-id)
+      :navigate-to go-to-view-id}
+     (when (and config/shell-navigation-disabled?
+                (#{:chat :community-overview} go-to-view-id))
+       {:dispatch-later
+        ;; 300 ms delay because, navigation is priority over shell card update
+        [{:dispatch [:shell/add-switcher-card go-to-view-id screen-params]
+          :ms       300}]}))))
 
 (rf/defn shell-navigate-back
   {:events [:shell/navigate-back]}

src/status_im2/contexts/shell/jump_to/utils.cljs

@@ -6,6 +6,7 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
+    [status-im2.config :as config]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     [status-im2.contexts.shell.jump-to.state :as state]
     [utils.re-frame :as rf]))
@@ -119,7 +120,8 @@
 ;;; Navigation
 (defn shell-navigation?
   [view-id]
-  (some #{view-id} shell.constants/floating-screens))
+  (when-not config/shell-navigation-disabled?
+    (some #{view-id} shell.constants/floating-screens)))
 
 (defn calculate-view-id
   []

src/status_im2/contexts/shell/jump_to/view.cljs

@@ -1,7 +1,9 @@
 (ns status-im2.contexts.shell.jump-to.view
   (:require
     [quo.core :as quo]
+    re-frame.db
     [react-native.core :as rn]
+    [status-im2.config :as config]
     [status-im2.contexts.shell.jump-to.animation :as animation]
     [status-im2.contexts.shell.jump-to.components.bottom-tabs.view :as bottom-tabs]
     [status-im2.contexts.shell.jump-to.components.floating-screens.view :as floating-screens]
@@ -15,12 +17,18 @@
 
 (defn navigate-back-handler
   []
-  (if (and (not @navigation.state/curr-modal)
-           (seq (utils/open-floating-screens)))
-    (do
-      (rf/dispatch [:navigate-back])
-      true)
-    false))
+  (let [chat-screen-open?     (and config/shell-navigation-disabled?
+                                   (= (get @re-frame.db/app-db :view-id) :chat))
+        open-floating-screens (utils/open-floating-screens)]
+    (if (and (not @navigation.state/curr-modal)
+             (or
+              chat-screen-open?
+              (seq open-floating-screens)))
+      (do
+        (when chat-screen-open? (rf/dispatch [:chat/close]))
+        (rf/dispatch [:navigate-back])
+        true)
+      false)))
 
 (defn floating-button
   [shared-values]
@@ -45,7 +53,8 @@
      [:f> bottom-tabs/f-bottom-tabs]
      [:f> home-stack/f-home-stack]
      [floating-button shared-values]
-     [floating-screens/view]]))
+     (when-not config/shell-navigation-disabled?
+       [floating-screens/view])]))
 
 (defn shell-stack
   []

src/status_im2/contexts/syncing/scan_sync_code/view.cljs

@@ -289,22 +289,14 @@
         scan-code?         (reagent/atom true)
         set-rescan-timeout (fn []
                              (reset! scan-code? false)
-                             (js/setTimeout (fn []
-                                              (reset! scan-code? true)
-                                              (reset! qr-code-succeed? false))
-                                            3000))]
+                             (js/setTimeout #(reset! scan-code? true) 3000))]
     (fn [{:keys [title show-bottom-view? background animated?]}]
       (let [torch-mode              (if @torch? :on :off)
             flashlight-icon         (if @torch? :i/flashlight-on :i/flashlight-off)
             scan-qr-code-tab?       (= @active-tab 1)
-            view-id                 (rf/sub [:view-id])
             show-camera?            (and scan-qr-code-tab?
                                          @camera-permission-granted?
                                          @preflight-check-passed?
-                                         (some #{view-id}
-                                               [:sign-in-intro
-                                                :sign-in
-                                                :scan-sync-code-page])
                                          (boolean (not-empty @qr-view-finder)))
             camera-ready-to-scan?   (and (or (not animated?) @render-camera?)
                                          show-camera?
@@ -320,7 +312,8 @@
                                       :show-camera?     show-camera?
                                       :content-opacity  content-opacity
                                       :subtitle-opacity subtitle-opacity
-                                      :title-opacity    title-opacity})]
+                                      :title-opacity    title-opacity})
+            view-id                 (rf/sub [:view-id])]
 
         (rn/use-effect
          #(set-listener-torch-off-on-app-inactive torch?))
@@ -355,9 +348,7 @@
             {:torch-mode            torch-mode
              :qr-view-finder        @qr-view-finder
              :scan-code?            @scan-code?
-             :set-qr-code-succeeded (fn []
-                                      (reset! qr-code-succeed? true)
-                                      (set-rescan-timeout))
+             :set-qr-code-succeeded #(reset! qr-code-succeed? true)
              :set-rescan-timeout    set-rescan-timeout}])
          [rn/view {:style (style/root-container (:top insets))}
           [:f> header

src/status_im2/contexts/wallet/add_address_to_watch/view.cljs

@@ -126,11 +126,9 @@
          [quo/button
           {:customization-color customization-color
            :disabled?           (or (string/blank? @input-value) (some? (validate @input-value)))
-           :on-press            (fn []
-                                  (rf/dispatch [:navigate-to
-                                                :confirm-address-to-watch
-                                                {:address @input-value}])
-                                  (clear-input))
+           :on-press            #(rf/dispatch [:navigate-to
+                                               :confirm-address-to-watch
+                                               {:address @input-value}])
            :container-style     {:z-index 2}}
           (i18n/label :t/continue)]}
         [quo/text-combinations

src/status_im2/contexts/wallet/common/sheets/account_options/view.cljs

@@ -23,8 +23,7 @@
 
 (defn- options
   [{:keys [theme show-account-selector? options-height]}]
-  (let [{:keys [name color emoji address]} (rf/sub [:wallet/current-viewing-account])
-        network-preference-details         (rf/sub [:wallet/network-preference-details])]
+  (let [{:keys [name color emoji address]} (rf/sub [:wallet/current-viewing-account])]
     [rn/view
      {:on-layout #(reset! options-height (oops/oget % "nativeEvent.layout.height"))
       :style     (when show-account-selector? style/options-container)}
@@ -45,7 +44,9 @@
      [quo/drawer-top
       {:title                name
        :type                 :account
-       :networks             network-preference-details
+       :networks             [{:network-name :ethereum :short-name "eth"}
+                              {:network-name :optimism :short-name "opt"}
+                              {:network-name :arbitrum :short-name "arb1"}]
        :description          address
        :account-avatar-emoji emoji
        :customization-color  color}]

src/status_im2/contexts/wallet/common/sheets/network_preferences/view.cljs

@@ -1,104 +1,70 @@
 (ns status-im2.contexts.wallet.common.sheets.network-preferences.view
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
+  (:require [quo.core :as quo]
             [quo.foundations.colors :as colors]
             [quo.foundations.resources :as resources]
             [quo.theme :as quo.theme]
-            [reagent.core :as reagent]
             [status-im2.contexts.wallet.common.sheets.network-preferences.style :as style]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
+(defn- mainnet
+  [account-color]
+  [{:title        "Mainnet"
+    :image        :icon-avatar
+    :image-props  {:icon (resources/get-network :ethereum)
+                   :size :size-20}
+    :action       :selector
+    :action-props {:type                :checkbox
+                   :customization-color account-color}}])
 
-(defn- make-network-item
-  [{:keys [network-name] :as _network}
-   {:keys [title color on-change network-preferences state] :as _options}]
-  {:title        (or title (string/capitalize (name network-name)))
-   :image        :icon-avatar
-   :image-props  {:icon (resources/get-network network-name)
-                  :size :size-20}
-   :action       :selector
-   :action-props {:type                (if (= :default state)
-                                         :filled-checkbox
-                                         :checkbox)
-                  :customization-color color
-                  :checked?            (contains? network-preferences network-name)
-                  :on-change           on-change}})
+(defn- networks-list
+  [account-color]
+  [{:title        "Optimism"
+    :image        :icon-avatar
+    :image-props  {:icon (resources/get-network :optimism)
+                   :size :size-20}
+    :action       :selector
+    :action-props {:type                :checkbox
+                   :customization-color account-color}}
+   {:title        "Arbitrum"
+    :image        :icon-avatar
+    :image-props  {:icon (resources/get-network :arbitrum)
+                   :size :size-20}
+    :action       :selector
+    :action-props {:type                :checkbox
+                   :customization-color account-color}}])
 
 (defn- view-internal
-  []
-  (let [state                               (reagent/atom :default)
-        {:keys [color address
-                network-preferences-names]} (rf/sub [:wallet/current-viewing-account])
-        initial-network-preferences-names   network-preferences-names
-        network-preferences-names-state     (reagent/atom #{})
-        toggle-network                      (fn [network-name]
-                                              (reset! state :changed)
-                                              (if (contains? @network-preferences-names-state
-                                                             network-name)
-                                                (swap! network-preferences-names-state disj
-                                                  network-name)
-                                                (swap! network-preferences-names-state conj
-                                                  network-name)))
-        get-current-preferences-names       (fn []
-                                              (if (= @state :default)
-                                                initial-network-preferences-names
-                                                @network-preferences-names-state))]
-    (fn [{:keys [on-save theme]}]
-      (let [network-details  (rf/sub [:wallet/network-details])
-            mainnet          (first network-details)
-            layer-2-networks (rest network-details)
-            current-networks (filter (fn [network]
-                                       (contains? (get-current-preferences-names)
-                                                  (:network-name network)))
-                                     network-details)]
-        [:<>
-         [quo/drawer-top
-          {:title       (i18n/label :t/network-preferences)
-           :description (i18n/label :t/network-preferences-desc)}]
-         [quo/data-item
-          {:status          :default
-           :size            :default
-           :description     :default
-           :label           :none
-           :blur?           false
-           :card?           true
-           :title           (i18n/label :t/address)
-           :custom-subtitle (fn []
-                              [quo/address-text
-                               {:networks current-networks
-                                :address  address
-                                :format   :long}])
-           :container-style (merge style/data-item
-                                   {:background-color (colors/theme-colors colors/neutral-2_5
-                                                                           colors/neutral-90
-                                                                           theme)})}]
-         [quo/category
-          {:list-type :settings
-           :data      [(make-network-item mainnet
-                                          {:state               @state
-                                           :title               (i18n/label :t/mainnet)
-                                           :color               color
-                                           :network-preferences (get-current-preferences-names)
-                                           :on-change           #(toggle-network (:network-name
-                                                                                  mainnet))})]}]
-         [quo/category
-          {:list-type :settings
-           :label     (i18n/label :t/layer-2)
-           :data      (mapv (fn [network]
-                              (make-network-item network
-                                                 {:state               @state
-                                                  :color               color
-                                                  :network-preferences (get-current-preferences-names)
-                                                  :on-change           #(toggle-network (:network-name
-                                                                                         network))}))
-                            layer-2-networks)}]
-         [quo/bottom-actions
-          {:button-one-label (i18n/label :t/confirm)
-           :button-one-props {:disabled?           (= @state :default)
-                              :on-press            (fn []
-                                                     (let [chain-ids (map :chain-id current-networks)]
-                                                       (on-save chain-ids)))
-                              :customization-color color}}]]))))
+  [{:keys [on-save theme]}]
+  (let [{:keys [color address]} (rf/sub [:wallet/current-viewing-account])]
+    [:<>
+     [quo/drawer-top
+      {:title       (i18n/label :t/network-preferences)
+       :description (i18n/label :t/network-preferences-desc)}]
+     [quo/data-item
+      {:status          :default
+       :size            :default
+       :label           :none
+       :blur?           false
+       :card?           true
+       :title           (i18n/label :t/address)
+       :subtitle        address
+       :subtitle-type   :default
+       :container-style (merge style/data-item
+                               {:background-color (colors/theme-colors colors/neutral-2_5
+                                                                       colors/neutral-90
+                                                                       theme)})}]
+     [quo/category
+      {:list-type :settings
+       :data      (mainnet color)}]
+     [quo/category
+      {:list-type :settings
+       :label     (i18n/label :t/layer-2)
+       :data      (networks-list color)}]
+     [quo/bottom-actions
+      {:button-one-label (i18n/label :t/update)
+       :button-one-props {:disabled?           true
+                          :on-press            on-save
+                          :customization-color color}}]]))
 
 (def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/common/temp.cljs

@@ -19,7 +19,6 @@
 
 (def tokens
   [{:token               :snt
-    :token-name          "Status"
     :state               :default
     :status              :empty
     :customization-color :blue
@@ -28,7 +27,6 @@
                           :percentage-change "0.00"
                           :fiat-change       "€0.00"}}
    {:token               :eth
-    :token-name          "Ether"
     :state               :default
     :status              :empty
     :customization-color :blue
@@ -37,7 +35,6 @@
                           :percentage-change "0.00"
                           :fiat-change       "€0.00"}}
    {:token               :dai
-    :token-name          "Dai Stablecoin"
     :state               :default
     :status              :empty
     :customization-color :blue

src/status_im2/contexts/wallet/common/utils.cljs

@@ -42,10 +42,6 @@
       (total-raw-balance-in-all-chains)
       (money/token->unit decimals)))
 
-(defn get-account-by-address
-  [accounts address]
-  (some #(when (= (:address %) address) %) accounts))
-
 (defn calculate-raw-balance
   [raw-balance decimals]
   (if-let [n (utils.number/parse-int raw-balance nil)]

src/status_im2/contexts/wallet/edit_account/view.cljs

@@ -15,10 +15,9 @@
 (defn- show-save-account-toast
   [updated-key theme]
   (let [message (case updated-key
-                  :name                     :t/edit-wallet-account-name-updated-message
-                  :color                    :t/edit-wallet-account-colour-updated-message
-                  :emoji                    :t/edit-wallet-account-emoji-updated-message
-                  :prod-preferred-chain-ids :t/edit-wallet-network-preferences-updated-message
+                  :name  :t/edit-wallet-account-name-updated-message
+                  :color :t/edit-wallet-account-colour-updated-message
+                  :emoji :t/edit-wallet-account-emoji-updated-message
                   nil)]
     (rf/dispatch [:toasts/upsert
                   {:id         :edit-account
@@ -56,11 +55,10 @@
                                               :new-value   @edited-account-name
                                               :theme       theme}))]
     (fn []
-      (let [{:keys [name emoji address color] :as account} (rf/sub [:wallet/current-viewing-account])
-            network-details                                (rf/sub [:wallet/network-preference-details])
-            account-name                                   (or @edited-account-name name)
-            button-disabled?                               (or (nil? @edited-account-name)
-                                                               (= name @edited-account-name))]
+      (let [{:keys [name emoji address color]
+             :as   account}  (rf/sub [:wallet/current-viewing-account])
+            account-name     (or @edited-account-name name)
+            button-disabled? (or (nil? @edited-account-name) (= name @edited-account-name))]
         [create-or-edit-account/view
          {:page-nav-right-side [{:icon-name :i/delete
                                  :on-press  #(js/alert "Delete account: to be implemented")}]
@@ -88,22 +86,18 @@
            :right-icon      :i/advanced
            :card?           true
            :title           (i18n/label :t/address)
-           :custom-subtitle (fn [] [quo/address-text
-                                    {:networks network-details
-                                     :address  address
-                                     :format   :long}])
+           :custom-subtitle (fn []
+                              [quo/address-text
+                               {:networks [{:network-name :ethereum :short-name "eth"}
+                                           {:network-name :optimism :short-name "opt"}
+                                           {:network-name :arbitrum :short-name "arb1"}]
+                                :address  address
+                                :format   :long}])
            :on-press        (fn []
                               (rf/dispatch [:show-bottom-sheet
-                                            {:content
-                                             (fn []
-                                               [network-preferences/view
-                                                {:on-save (fn [chain-ids]
-                                                            (rf/dispatch [:hide-bottom-sheet])
-                                                            (save-account
-                                                             {:account     account
-                                                              :updated-key :prod-preferred-chain-ids
-                                                              :new-value   chain-ids
-                                                              :theme       theme}))}])}]))
+                                            {:content (fn []
+                                                        [network-preferences/view
+                                                         {:on-save #(js/alert "calling on save")}])}]))
            :container-style style/data-item}]]))))
 
 (def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/send/events.cljs

@@ -1,12 +0,0 @@
-(ns status-im2.contexts.wallet.send.events
-  (:require
-    [utils.number]
-    [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :wallet/select-address-tab
- (fn [{:keys [db]} [tab]]
-   {:db (assoc-in db [:wallet :ui :send :select-address-tab] tab)}))
-
-(rf/reg-event-fx :wallet/select-send-account-address
- (fn [{:keys [db]} [address]]
-   {:db (assoc db [:wallet :ui :send :send-account-address] address)}))

src/status_im2/contexts/wallet/send/select_address/style.cljs

@@ -15,6 +15,11 @@
   {:padding-left  20
    :padding-right 8})
 
+(def empty-container-style
+  {:justify-content :center
+   :flex            1
+   :margin-bottom   44})
+
 (def button
   {:justify-self      :flex-end
    :margin-bottom     46

src/status_im2/contexts/wallet/send/select_address/tabs/style.cljs

@@ -1,10 +0,0 @@
-(ns status-im2.contexts.wallet.send.select-address.tabs.style)
-
-(def empty-container-style
-  {:justify-content :center
-   :flex            1
-   :margin-bottom   44})
-
-(def my-accounts-container
-  {:padding-left  8
-   :padding-right 8})

src/status_im2/contexts/wallet/send/select_address/tabs/view.cljs

@@ -1,57 +0,0 @@
-(ns status-im2.contexts.wallet.send.select-address.tabs.view
-  (:require
-    [quo.core :as quo]
-    [react-native.gesture :as gesture]
-    [status-im2.contexts.wallet.send.select-address.tabs.style :as style]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn- render-account-item
-  [{:keys [color address] :as account}]
-  [quo/account-item
-   {:account-props (assoc account :customization-color color)
-    :on-press      (fn []
-                     (rf/dispatch [:wallet/select-send-account-address address])
-                     (rf/dispatch [:navigate-to-within-stack
-                                   [:wallet-select-asset :wallet-select-address]]))}])
-
-(def data
-  [{:id :tab/recent :label (i18n/label :t/recent) :accessibility-label :recent-tab}
-   {:id :tab/saved :label (i18n/label :t/saved) :accessibility-label :saved-tab}
-   {:id :tab/contacts :label (i18n/label :t/contacts) :accessibility-label :contacts-tab}
-   {:id :tab/my-accounts :label (i18n/label :t/my-accounts) :accessibility-label :my-accounts-tab}])
-
-(defn my-accounts
-  []
-  (let [other-accounts (rf/sub [:wallet/accounts-without-current-viewing-account])]
-    (if (zero? (count other-accounts))
-      [quo/empty-state
-       {:title           (i18n/label :t/no-other-accounts)
-        :description     (i18n/label :t/here-is-a-cat-in-a-box-instead)
-        :placeholder?    true
-        :container-style style/empty-container-style}]
-      [gesture/flat-list
-       {:data                            other-accounts
-        :render-fn                       render-account-item
-        :content-container-style         style/my-accounts-container
-        :shows-vertical-scroll-indicator false}])))
-
-(defn view
-  [selected-tab]
-  (case selected-tab
-    :tab/recent      [quo/empty-state
-                      {:title           (i18n/label :t/no-recent-transactions)
-                       :description     (i18n/label :t/make-one-it-is-easy-we-promise)
-                       :placeholder?    true
-                       :container-style style/empty-container-style}]
-    :tab/saved       [quo/empty-state
-                      {:title           (i18n/label :t/no-saved-addresses)
-                       :description     (i18n/label :t/you-like-to-type-43-characters)
-                       :placeholder?    true
-                       :container-style style/empty-container-style}]
-    :tab/contacts    [quo/empty-state
-                      {:title           (i18n/label :t/no-contacts)
-                       :description     (i18n/label :t/no-contacts-description)
-                       :placeholder?    true
-                       :container-style style/empty-container-style}]
-    :tab/my-accounts [my-accounts]))

src/status_im2/contexts/wallet/send/select_address/view.cljs

@@ -2,23 +2,47 @@
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im2.constants :as constants]
     [status-im2.contexts.wallet.common.account-switcher.view :as account-switcher]
     [status-im2.contexts.wallet.item-types :as types]
     [status-im2.contexts.wallet.send.select-address.style :as style]
-    [status-im2.contexts.wallet.send.select-address.tabs.view :as tabs]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(def ^:private tabs-data
+(def tabs-data
   [{:id :tab/recent :label (i18n/label :t/recent) :accessibility-label :recent-tab}
    {:id :tab/saved :label (i18n/label :t/saved) :accessibility-label :saved-tab}
    {:id :tab/contacts :label (i18n/label :t/contacts) :accessibility-label :contacts-tab}
    {:id :tab/my-accounts :label (i18n/label :t/my-accounts) :accessibility-label :my-accounts-tab}])
 
+(defn- tab-view
+  [selected-tab]
+  (case selected-tab
+    :tab/recent      [quo/empty-state
+                      {:title           (i18n/label :t/no-recent-transactions)
+                       :description     (i18n/label :t/make-one-it-is-easy-we-promise)
+                       :placeholder?    true
+                       :container-style style/empty-container-style}]
+    :tab/saved       [quo/empty-state
+                      {:title           (i18n/label :t/no-saved-addresses)
+                       :description     (i18n/label :t/you-like-to-type-43-characters)
+                       :placeholder?    true
+                       :container-style style/empty-container-style}]
+    :tab/contacts    [quo/empty-state
+                      {:title           (i18n/label :t/no-contacts)
+                       :description     (i18n/label :t/no-contacts-description)
+                       :placeholder?    true
+                       :container-style style/empty-container-style}]
+    :tab/my-accounts [quo/empty-state
+                      {:title           (i18n/label :t/no-other-accounts)
+                       :description     (i18n/label :t/here-is-a-cat-in-a-box-instead)
+                       :placeholder?    true
+                       :container-style style/empty-container-style}]))
+
 (defn- address-input
   [input-value input-focused?]
   (fn []
@@ -107,19 +131,18 @@
          :keyboard-should-persist-taps :handled
          :render-fn                    suggestion-component}]])))
 
-(defn- f-view
+(defn- f-view-internal
   []
-  (let [on-close       (fn []
+  (let [selected-tab   (reagent/atom (:id (first tabs-data)))
+        on-close       (fn []
                          (rf/dispatch [:wallet/clean-scanned-address])
                          (rf/dispatch [:wallet/clean-local-suggestions])
-                         (rf/dispatch [:wallet/select-address-tab nil])
                          (rf/dispatch [:navigate-back]))
-        on-change-tab  #(rf/dispatch [:wallet/select-address-tab %])
+        on-change-tab  #(reset! selected-tab %)
         input-value    (reagent/atom "")
         input-focused? (reagent/atom false)]
     (fn []
-      (let [selected-tab          (or (rf/sub [:wallet/send-tab]) (:id (first tabs-data)))
-            valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))]
+      (let [valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))]
         (rn/use-effect (fn []
                          (fn []
                            (rf/dispatch [:wallet/clean-scanned-address])
@@ -156,14 +179,15 @@
              {:style            style/tabs
               :container-style  style/tabs-content
               :size             32
-              :default-active   selected-tab
+              :default-active   @selected-tab
               :data             tabs-data
               :scrollable?      true
               :scroll-on-press? true
               :on-change        on-change-tab}]
-            [tabs/view selected-tab]])]))))
+            [tab-view @selected-tab]])]))))
 
-(defn view
+(defn- view-internal
   []
-  [:f> f-view])
+  [:f> f-view-internal])
 
+(def view (quo.theme/with-theme view-internal))

src/status_im2/events.cljs

@@ -22,7 +22,6 @@
     status-im2.contexts.shell.share.events
     status-im2.contexts.syncing.events
     status-im2.contexts.wallet.events
-    status-im2.contexts.wallet.send.events
     [status-im2.db :as db]
     [utils.re-frame :as rf]))
 

src/status_im2/navigation/screens.cljs

@@ -210,7 +210,7 @@
                  :animations             (merge transitions/new-to-status-modal-animations
                                                 transitions/push-animations-for-transparent-background)
                  :modalPresentationStyle :overCurrentContext}
-     :component enable-notifications/view}
+     :component enable-notifications/enable-notifications}
 
     {:name      :identifiers
      :component identifiers/view

src/status_im2/subs/messages.cljs

@@ -1,6 +1,7 @@
 (ns status-im2.subs.messages
   (:require
     [re-frame.core :as re-frame]
+    [status-im.chat.models.reactions :as models.reactions]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.messages.list.events :as models.message-list]
     [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver]
@@ -176,21 +177,9 @@
  :<- [:multiaccount/public-key]
  :<- [:messages/reactions]
  (fn [[current-public-key reactions] [_ message-id chat-id]]
-   (let [reactions (get-in reactions [chat-id message-id])]
-     (reduce
-      (fn [acc [emoji-id reactions]]
-        (if (pos? (count reactions))
-          (let [own (first (filter (fn [[_ {:keys [from]}]]
-                                     (= from current-public-key))
-                                   reactions))]
-            (conj acc
-                  {:emoji-id          emoji-id
-                   :own               (boolean (seq own))
-                   :emoji-reaction-id (:emoji-reaction-id (second own))
-                   :quantity          (count reactions)}))
-          acc))
-      []
-      reactions))))
+   (models.reactions/message-reactions
+    current-public-key
+    (get-in reactions [chat-id message-id]))))
 
 (re-frame/reg-sub
  :chats/all-loaded?

src/status_im2/subs/root.cljs

@@ -13,7 +13,6 @@
     status-im2.subs.shell
     status-im2.subs.wallet.collectibles
     status-im2.subs.wallet.networks
-    status-im2.subs.wallet.send
     status-im2.subs.wallet.wallet))
 
 (defn reg-root-key-sub
@@ -100,7 +99,7 @@
 (reg-root-key-sub :chat/inputs-with-mentions :chat/inputs-with-mentions)
 (reg-root-key-sub :chats-home-list :chats-home-list)
 (reg-root-key-sub :chats/recording? :chats/recording?)
-(reg-root-key-sub :reactions/authors :reactions/authors)
+(reg-root-key-sub :chat/reactions-authors :chat/reactions-authors)
 
 ;;chat images lightbox
 (reg-root-key-sub :lightbox/exit-signal :lightbox/exit-signal)
@@ -154,6 +153,7 @@
 (reg-root-key-sub :wallet/scanned-address :wallet/scanned-address)
 (reg-root-key-sub :wallet/create-account :wallet/create-account)
 (reg-root-key-sub :wallet/networks :wallet/networks)
+(reg-root-key-sub :wallet/scanned-address :wallet/scanned-address)
 (reg-root-key-sub :wallet/local-suggestions :wallet/local-suggestions)
 (reg-root-key-sub :wallet/valid-ens-or-address? :wallet/valid-ens-or-address?)
 (reg-root-key-sub :wallet/send-address :wallet/send-address)

src/status_im2/subs/shell.cljs

@@ -2,6 +2,7 @@
   (:require
     [re-frame.core :as re-frame]
     [status-im2.common.resources :as resources]
+    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     [utils.datetime :as datetime]
@@ -268,4 +269,5 @@
  :shell/chat-screen-loaded?
  :<- [:shell/loaded-screens]
  (fn [screens]
-   (get screens shell.constants/chat-screen)))
+   (or config/shell-navigation-disabled?
+       (get screens shell.constants/chat-screen))))

src/status_im2/subs/wallet/networks.cljs

@@ -34,15 +34,13 @@
  :wallet/network-details
  :<- [:wallet/filtered-networks-by-mode false]
  (fn [networks]
-   (->> networks
-        (keep
-         (fn [{:keys [chain-id related-chain-id layer test?]}]
-           (let [network-details (get network-list (if test? related-chain-id chain-id))]
-             (assoc network-details
-                    :chain-id         chain-id
-                    :related-chain-id related-chain-id
-                    :layer            layer))))
-        (sort-by (juxt :layer :short-name)))))
+   (keep
+    (fn [{:keys [chain-id related-chain-id test?]}]
+      (let [network-details (get network-list (if test? related-chain-id chain-id))]
+        (assoc network-details
+               :chain-id         chain-id
+               :related-chain-id related-chain-id)))
+    networks)))
 
 (re-frame/reg-sub
  :wallet/network-details-by-chain-id

src/status_im2/subs/wallet/networks_test.cljs

@@ -11,28 +11,22 @@
   {:test [{:test?            true
            :short-name       "eth"
            :network-name     :ethereum
-           :related-chain-id 1
-           :layer            1}
+           :related-chain-id 1}
           {:test?            true
            :short-name       "arb1"
-           :related-chain-id 42161
-           :layer            2}
+           :related-chain-id 42161}
           {:test?            true
            :short-name       "opt"
-           :related-chain-id 10
-           :layer            2}]
+           :related-chain-id 10}]
    :prod [{:test?      false
            :short-name "eth"
-           :chain-id   1
-           :layer      1}
+           :chain-id   1}
           {:test?      false
            :short-name "arb1"
-           :chain-id   42161
-           :layer      2}
+           :chain-id   42161}
           {:test?      false
            :short-name "opt"
-           :chain-id   10
-           :layer      2}]})
+           :chain-id   10}]})
 
 (h/deftest-sub :wallet/network-details
   [sub-name]
@@ -40,14 +34,11 @@
     (swap! rf-db/app-db assoc :wallet/networks network-data)
     (is (= [{:network-name :ethereum
              :short-name   "eth"
-             :chain-id     1
-             :layer        1}
+             :chain-id     1}
             {:network-name :arbitrum
              :short-name   "arb1"
-             :chain-id     42161
-             :layer        2}
+             :chain-id     42161}
             {:network-name :optimism
              :short-name   "opt"
-             :chain-id     10
-             :layer        2}]
+             :chain-id     10}]
            (map #(dissoc % :source :related-chain-id) (rf/sub [sub-name]))))))

src/status_im2/subs/wallet/send.cljs

@@ -1,10 +0,0 @@
-(ns status-im2.subs.wallet.send
-  (:require
-    [re-frame.core :as rf]
-    [utils.number]))
-
-(rf/reg-sub
- :wallet/send-tab
- :<- [:wallet/ui]
- (fn [ui]
-   (get-in ui [:send :select-address-tab])))

src/status_im2/subs/wallet/send_test.cljs

@@ -1,14 +0,0 @@
-(ns status-im2.subs.wallet.send-test
-  (:require
-    [cljs.test :refer [is testing]]
-    [re-frame.db :as rf-db]
-    status-im2.subs.root
-    status-im2.subs.wallet.send
-    [test-helpers.unit :as h]
-    [utils.re-frame :as rf]))
-
-(h/deftest-sub :wallet/send-tab
-  [sub-name]
-  (testing "returns active tab for selecting address"
-    (swap! rf-db/app-db assoc-in [:wallet :ui :send :select-address-tab] :tabs/recent)
-    (is (= :tabs/recent (rf/sub [sub-name])))))

src/status_im2/subs/wallet/wallet.cljs

@@ -4,25 +4,6 @@
             [status-im2.contexts.wallet.common.utils :as utils]
             [utils.number]))
 
-(defn- filter-networks
-  [chain-ids network-details]
-  (filter (fn [{:keys [chain-id]}]
-            (contains? chain-ids chain-id))
-          network-details))
-
-(defn- assoc-network-preferences-names
-  [network-details account testnet?]
-  (let [{:keys [prod-preferred-chain-ids
-                test-preferred-chain-ids]} account
-        current-chain-ids                  (if testnet?
-                                             test-preferred-chain-ids
-                                             prod-preferred-chain-ids)
-        network-preferences-names          (->> network-details
-                                                (filter-networks current-chain-ids)
-                                                (map :network-name)
-                                                (set))]
-    (assoc account :network-preferences-names network-preferences-names)))
-
 (rf/reg-sub
  :wallet/ui
  :<- [:wallet]
@@ -33,12 +14,6 @@
  :<- [:wallet/ui]
  :-> :tokens-loading?)
 
-
-(rf/reg-sub
- :wallet/current-viewing-account-address
- :<- [:wallet]
- :-> :current-viewing-account-address)
-
 (rf/reg-sub
  :wallet/watch-address-activity-state
  :<- [:wallet/ui]
@@ -47,16 +22,10 @@
 (rf/reg-sub
  :wallet/accounts
  :<- [:wallet]
- :<- [:wallet/network-details]
- (fn [[wallet network-details]]
-   ;; TODO(@rende11): `testnet?` value would be relevant after this implementation,
-   ;; https://github.com/status-im/status-mobile/issues/17826
-   (let [testnet? false]
-     (->> wallet
-          :accounts
-          vals
-          (map #(assoc-network-preferences-names network-details % testnet?))
-          (sort-by :position)))))
+ :-> #(->> %
+           :accounts
+           vals
+           (sort-by :position)))
 
 (rf/reg-sub
  :wallet/addresses
@@ -90,13 +59,12 @@
 
 (rf/reg-sub
  :wallet/current-viewing-account
- :<- [:wallet/accounts]
- :<- [:wallet/current-viewing-account-address]
+ :<- [:wallet]
  :<- [:wallet/balances]
- (fn [[accounts current-viewing-account-address balances]]
-   (let [current-viewing-account (utils/get-account-by-address accounts current-viewing-account-address)]
-     (-> current-viewing-account
-         (assoc :balance (get balances current-viewing-account-address))))))
+ (fn [[{:keys [current-viewing-account-address] :as wallet} balances]]
+   (-> wallet
+       (get-in [:accounts current-viewing-account-address])
+       (assoc :balance (get balances current-viewing-account-address)))))
 
 (rf/reg-sub
  :wallet/tokens-filtered
@@ -117,6 +85,11 @@
                                  sorted-tokens)]
      filtered-tokens)))
 
+(rf/reg-sub
+ :wallet/current-viewing-account-address
+ :<- [:wallet]
+ :-> :current-viewing-account-address)
+
 (rf/reg-sub
  :wallet/accounts-without-current-viewing-account
  :<- [:wallet/accounts]
@@ -130,9 +103,8 @@
         market-values                     (:usd market-values-per-currency)
         {:keys [price change-pct-24hour]} market-values
         fiat-change                       (utils/calculate-fiat-change crypto-value change-pct-24hour)]
-    (when (and crypto-value (seq (:name item)))
+    (when crypto-value
       {:token               (keyword (string/lower-case (:symbol item)))
-       :token-name          (:name item)
        :state               :default
        :status              (cond
                               (pos? change-pct-24hour) :positive
@@ -150,11 +122,3 @@
  :<- [:chain-id]
  (fn [[current-account chain-id]]
    (mapv #(calc-token-value % chain-id) (:tokens current-account))))
-
-(rf/reg-sub
- :wallet/network-preference-details
- :<- [:wallet/current-viewing-account]
- :<- [:wallet/network-details]
- (fn [[current-viewing-account network-details]]
-   (let [network-preferences-names (:network-preferences-names current-viewing-account)]
-     (filter #(contains? network-preferences-names (:network-name %)) network-details))))

src/status_im2/subs/wallet/wallet_test.cljs

@@ -82,33 +82,6 @@
           :removed                  false
           :tokens                   tokens-0x2}})
 
-(def network-data
-  {:test [{:test?            true
-           :short-name       "eth"
-           :network-name     :ethereum
-           :related-chain-id 1
-           :layer            1}
-          {:test?            true
-           :short-name       "arb1"
-           :related-chain-id 42161
-           :layer            2}
-          {:test?            true
-           :short-name       "opt"
-           :related-chain-id 10
-           :layer            2}]
-   :prod [{:test?      false
-           :short-name "eth"
-           :chain-id   1
-           :layer      1}
-          {:test?      false
-           :short-name "arb1"
-           :chain-id   42161
-           :layer      2}
-          {:test?      false
-           :short-name "opt"
-           :chain-id   10
-           :layer      2}]})
-
 (h/deftest-sub :wallet/balances
   [sub-name]
   (testing "a map: address->balance"
@@ -123,60 +96,50 @@
 (h/deftest-sub :wallet/accounts
   [sub-name]
   (testing "returns all accounts without balance"
-    (swap! rf-db/app-db
-      #(-> %
-           (assoc-in [:wallet :accounts] accounts)
-           (assoc :wallet/networks network-data)))
-    (is
-     (= (list {:path                      "m/44'/60'/0'/0/0"
-               :emoji                     "😃"
-               :key-uid                   "0x2f5ea39"
-               :address                   "0x1"
-               :wallet                    false
-               :name                      "Account One"
-               :type                      :generated
-               :chat                      false
-               :test-preferred-chain-ids  #{5 420 421613}
-               :color                     :blue
-               :hidden                    false
-               :prod-preferred-chain-ids  #{1 10 42161}
-               :network-preferences-names #{:ethereum :arbitrum :optimism}
-               :position                  0
-               :clock                     1698945829328
-               :created-at                1698928839000
-               :operable                  "fully"
-               :mixedcase-address         "0x7bcDfc75c431"
-               :public-key                "0x04371e2d9d66b82f056bc128064"
-               :removed                   false
-               :tokens                    tokens-0x1}
-              {:path                      "m/44'/60'/0'/0/1"
-               :emoji                     "💎"
-               :key-uid                   "0x2f5ea39"
-               :address                   "0x2"
-               :wallet                    false
-               :name                      "Account Two"
-               :type                      :generated
-               :chat                      false
-               :test-preferred-chain-ids  #{5 420 421613}
-               :color                     :purple
-               :hidden                    false
-               :prod-preferred-chain-ids  #{1 10 42161}
-               :network-preferences-names #{:ethereum :arbitrum :optimism}
-               :position                  1
-               :clock                     1698945829328
-               :created-at                1698928839000
-               :operable                  "fully"
-               :mixedcase-address         "0x7bcDfc75c431"
-               :public-key                "0x04371e2d9d66b82f056bc128064"
-               :removed                   false
-               :tokens                    tokens-0x2})
-        (rf/sub [sub-name])))))
+    (swap! rf-db/app-db #(assoc-in % [:wallet :accounts] accounts))
 
-(h/deftest-sub :wallet/current-viewing-account-address
-  [sub-name]
-  (testing "returns current viewing account address"
-    (swap! rf-db/app-db #(assoc-in % [:wallet :current-viewing-account-address] "0x1"))
-    (is (= "0x1" (rf/sub [sub-name])))))
+    (is
+     (= (list {:path                     "m/44'/60'/0'/0/0"
+               :emoji                    "😃"
+               :key-uid                  "0x2f5ea39"
+               :address                  "0x1"
+               :wallet                   false
+               :name                     "Account One"
+               :type                     :generated
+               :chat                     false
+               :test-preferred-chain-ids #{5 420 421613}
+               :color                    :blue
+               :hidden                   false
+               :prod-preferred-chain-ids #{1 10 42161}
+               :position                 0
+               :clock                    1698945829328
+               :created-at               1698928839000
+               :operable                 "fully"
+               :mixedcase-address        "0x7bcDfc75c431"
+               :public-key               "0x04371e2d9d66b82f056bc128064"
+               :removed                  false
+               :tokens                   tokens-0x1}
+              {:path                     "m/44'/60'/0'/0/1"
+               :emoji                    "💎"
+               :key-uid                  "0x2f5ea39"
+               :address                  "0x2"
+               :wallet                   false
+               :name                     "Account Two"
+               :type                     :generated
+               :chat                     false
+               :test-preferred-chain-ids #{5 420 421613}
+               :color                    :purple
+               :hidden                   false
+               :prod-preferred-chain-ids #{1 10 42161}
+               :position                 1
+               :clock                    1698945829328
+               :created-at               1698928839000
+               :operable                 "fully"
+               :mixedcase-address        "0x7bcDfc75c431"
+               :public-key               "0x04371e2d9d66b82f056bc128064"
+               :removed                  false
+               :tokens                   tokens-0x2})
+        (rf/sub [sub-name])))))
 
 (h/deftest-sub :wallet/current-viewing-account
   [sub-name]
@@ -184,35 +147,35 @@
     (swap! rf-db/app-db
       #(-> %
            (assoc-in [:wallet :accounts] accounts)
-           (assoc-in [:wallet :current-viewing-account-address] "0x1")
-           (assoc :wallet/networks network-data)))
+           (assoc-in [:wallet :current-viewing-account-address] "0x1")))
     (let [result (rf/sub [sub-name])]
+
       (is
-       (= {:path                      "m/44'/60'/0'/0/0"
-           :emoji                     "😃"
-           :key-uid                   "0x2f5ea39"
-           :address                   "0x1"
-           :wallet                    false
-           :name                      "Account One"
-           :type                      :generated
-           :chat                      false
-           :test-preferred-chain-ids  #{5 420 421613}
-           :color                     :blue
-           :hidden                    false
-           :prod-preferred-chain-ids  #{1 10 42161}
-           :network-preferences-names #{:ethereum :arbitrum :optimism}
-           :position                  0
-           :clock                     1698945829328
-           :created-at                1698928839000
-           :operable                  "fully"
-           :mixedcase-address         "0x7bcDfc75c431"
-           :public-key                "0x04371e2d9d66b82f056bc128064"
-           :removed                   false
-           :tokens                    tokens-0x1}
+       (= {:path                     "m/44'/60'/0'/0/0"
+           :emoji                    "😃"
+           :key-uid                  "0x2f5ea39"
+           :address                  "0x1"
+           :wallet                   false
+           :name                     "Account One"
+           :type                     :generated
+           :chat                     false
+           :test-preferred-chain-ids #{5 420 421613}
+           :color                    :blue
+           :hidden                   false
+           :prod-preferred-chain-ids #{1 10 42161}
+           :position                 0
+           :clock                    1698945829328
+           :created-at               1698928839000
+           :operable                 "fully"
+           :mixedcase-address        "0x7bcDfc75c431"
+           :public-key               "0x04371e2d9d66b82f056bc128064"
+           :removed                  false
+           :tokens                   tokens-0x1}
           (dissoc result :balance)))
 
       (is (money/equal-to (:balance result) (money/bignumber 3250))))))
 
+
 (h/deftest-sub :wallet/addresses
   [sub-name]
   (testing "returns all addresses"
@@ -220,6 +183,7 @@
       #(-> %
            (assoc-in [:wallet :accounts] accounts)
            (assoc-in [:wallet :current-viewing-account-address] "0x1")))
+
     (is
      (= (set ["0x1" "0x2"])
         (rf/sub [sub-name])))))
@@ -237,63 +201,39 @@
     (swap! rf-db/app-db #(assoc-in % [:wallet :ui :watch-address-activity-state] :has-activity))
     (is (= :has-activity (rf/sub [sub-name])))))
 
+(h/deftest-sub :wallet/current-viewing-account-address
+  [sub-name]
+  (testing "returns the address of the current viewing account"
+    (swap! rf-db/app-db #(assoc-in % [:wallet :current-viewing-account-address] "0x1"))
+    (is (= "0x1" (rf/sub [sub-name])))))
+
 (h/deftest-sub :wallet/accounts-without-current-viewing-account
   [sub-name]
   (testing "returns the accounts list without the current viewing account in it"
     (swap! rf-db/app-db
       #(-> %
            (assoc-in [:wallet :accounts] accounts)
-           (assoc-in [:wallet :current-viewing-account-address] "0x2")
-           (assoc :wallet/networks network-data)))
+           (assoc-in [:wallet :current-viewing-account-address] "0x2")))
     (is
      (= (list
-         {:path                      "m/44'/60'/0'/0/0"
-          :emoji                     "😃"
-          :key-uid                   "0x2f5ea39"
-          :address                   "0x1"
-          :wallet                    false
-          :name                      "Account One"
-          :type                      :generated
-          :chat                      false
-          :test-preferred-chain-ids  #{5 420 421613}
-          :color                     :blue
-          :hidden                    false
-          :prod-preferred-chain-ids  #{1 10 42161}
-          :network-preferences-names #{:ethereum :arbitrum :optimism}
-          :position                  0
-          :clock                     1698945829328
-          :created-at                1698928839000
-          :operable                  "fully"
-          :mixedcase-address         "0x7bcDfc75c431"
-          :public-key                "0x04371e2d9d66b82f056bc128064"
-          :removed                   false
-          :tokens                    tokens-0x1})
+         {:path                     "m/44'/60'/0'/0/0"
+          :emoji                    "😃"
+          :key-uid                  "0x2f5ea39"
+          :address                  "0x1"
+          :wallet                   false
+          :name                     "Account One"
+          :type                     :generated
+          :chat                     false
+          :test-preferred-chain-ids #{5 420 421613}
+          :color                    :blue
+          :hidden                   false
+          :prod-preferred-chain-ids #{1 10 42161}
+          :position                 0
+          :clock                    1698945829328
+          :created-at               1698928839000
+          :operable                 "fully"
+          :mixedcase-address        "0x7bcDfc75c431"
+          :public-key               "0x04371e2d9d66b82f056bc128064"
+          :removed                  false
+          :tokens                   tokens-0x1})
         (rf/sub [sub-name])))))
-
-(h/deftest-sub :wallet/network-preference-details
-  [sub-name]
-  (testing "returns current viewing account address"
-    (swap! rf-db/app-db
-      #(-> %
-           (assoc-in [:wallet :accounts] accounts)
-           (assoc-in [:wallet :current-viewing-account-address] "0x1")
-           (assoc :wallet/networks network-data)))
-    (is
-     (= [{:short-name       "eth"
-          :network-name     :ethereum
-          :chain-id         1
-          :related-chain-id nil
-          :layer            1}
-         {:short-name       "arb1"
-          :network-name     :arbitrum
-          :chain-id         42161
-          :related-chain-id nil
-          :layer            2}
-         {:short-name       "opt"
-          :network-name     :optimism
-          :chain-id         10
-          :related-chain-id nil
-          :layer            2}]
-        (->> (rf/sub [sub-name])
-             ;; Removed `#js source` property for correct compare
-             (map #(dissoc % :source)))))))

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "chore/storenode-requests-manager",
-    "commit-sha1": "43d7c93cb6c1aeb414adc3f3f6e6f6e173d98c7a",
-    "src-sha256": "03va3x6q50kzb2g0kvqyqh3zpix0nlz1v5089sz24hq4k7bidz36"
+    "version": "v0.171.31",
+    "commit-sha1": "271778a1e07e585a12790b4e2226f13e36ea89f4",
+    "src-sha256": "1c998kyhya98a0zp795i3xrx2r08yjdaifb32ylr4snjjln6k34c"
 }

test/appium/tests/activity_center/test_activity_center.py

@@ -350,6 +350,12 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
         if reply_element.is_element_displayed():
             self.errors.append("Reply is still shown after removing from activity centre!")
 
+        self.home_1.just_fyi("Reset filter to show all AC notifications again")
+        self.home_1.reply_activity_tab_button.click()
+        self.home_1.mention_activity_tab_button.click()
+        self.home_1.all_activity_tab_button.click()
+        self.home_1.close_activity_centre.click()
+
         self.errors.verify_no_errors()
 
 

test/appium/tests/critical/chats/test_1_1_public_chats.py

@@ -668,9 +668,9 @@ class TestOneToOneChatMultipleSharedDevicesNewUiTwo(MultipleSharedDeviceTestCase
         self.home_2.just_fyi("Deleting chat via delete button and check it will not reappear after relaunching app")
         self.home_2.delete_chat_long_press(username=self.username_1)
         if self.home_2.get_chat_from_home_view(self.username_1).is_element_displayed():
-            self.errors.append("Deleted '%s' chat is shown, but the chat has been deleted" % self.username_1)
+            self.errors.append('Deleted %s chat is shown, but the chat has been deleted' % self.username_1)
         self.home_2.reopen_app()
         if self.home_2.get_chat_from_home_view(self.username_1).is_element_displayed(15):
             self.errors.append(
-                "Deleted chat '%s' is shown after re-login, but the chat has been deleted" % self.username_1)
+                'Deleted chat %s is shown after re-login, but the chat has been deleted' % self.username_1)
         self.errors.verify_no_errors()

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -71,6 +71,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(702846)
+    @marks.xfail(reason="Issue #18075", run=False)
     def test_community_navigate_to_channel_when_relaunch(self):
         text_message = 'some_text'
         if not self.channel.chat_message_input.is_element_displayed():

test/appium/tests/critical/test_deep_and_universal_links.py

@@ -92,7 +92,6 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(704614)
-    @marks.skip  # ToDo: the feature is not ready yet
     def test_links_open_universal_links_from_other_apps(self):
         app_package = self.driver.current_package
         self.home.just_fyi("Opening a profile URL from google search bar when user is still logged in")

test/appium/views/chat_view.py

@@ -291,8 +291,7 @@ class ChatElementByText(Text):
         try:
             self.driver.info("Trying to access image inside message with text '%s'" % self.message_text)
             ChatElementByText(self.driver, self.message_text).wait_for_sent_state(60)
-            return Button(self.driver,
-                          xpath="%s//android.widget.ImageView[@content-desc='image-message']" % self.locator)
+            return Button(self.driver, xpath="%s//*[@content-desc='image-message']" % self.locator)
         except NoSuchElementException:
             self.driver.fail("No image is found in message!")
 

test/appium/views/home_view.py

@@ -276,8 +276,7 @@ class HomeView(BaseView):
 
         # Options on long tap
         self.chats_menu_invite_friends_button = Button(self.driver, accessibility_id="chats-menu-invite-friends-button")
-        self.close_chat_button = Button(self.driver, accessibility_id="close-chat")
-        self.confirm_closing_chat_button = Button(self.driver, accessibility_id="Confirm")
+        self.delete_chat_button = Button(self.driver, translation_id="close-chat")
         self.clear_history_button = Button(self.driver, accessibility_id="clear-history")
         self.mute_chat_button = MuteButton(self.driver, accessibility_id="mute-chat")
         self.mute_community_button = MuteButton(self.driver, accessibility_id="mute-community")
@@ -522,8 +521,8 @@ class HomeView(BaseView):
     def delete_chat_long_press(self, username):
         self.driver.info("Deleting chat '%s' by long press" % username)
         self.get_chat(username).long_press_element()
-        self.close_chat_button.click()
-        self.confirm_closing_chat_button.click()
+        self.delete_chat_button.click()
+        self.delete_chat_button.click()
 
     def leave_chat_long_press(self, username):
         self.driver.info("Leaving chat '%s' by long press" % username)

translations/en.json

@@ -494,7 +494,7 @@
     "empty-chat-description-community": "It's been quiet here for the last {{quiet-hours}}.",
     "empty-chat-description-public-share-this": "share this chat.",
     "enable": "Enable",
-    "enable-notifications-sub-title": "Receive notifications about your new messages or wallet transactions",
+    "enable-notifications-sub-title": "Receive notifications when somebody sends you a message or crypto to your wallet",
     "encrypt-with-password": "Encrypt with password",
     "ending-not-allowed": "{{ending}} ending is not allowed",
     "ends-with-space": "Cannot end with space",
@@ -1407,8 +1407,6 @@
     "try-keeping-the-card-still": "Try keeping the card still",
     "turn-nfc-on": "Turn NFC on to continue",
     "turn-nfc-description": "NFC is disabled on yor device. You can enable it in settings",
-    "testnet-mode-prompt-title": "Warning!",
-    "testnet-mode-prompt-content": "You are about to switch the network mode. This will log you out and you will have to login again.",
     "keycard-init-title": "Looking for cards...",
     "keycard-init-description": "Put the card to the back of your phone to continue",
     "keycard-awaiting-title": "Still looking...",
@@ -2375,7 +2373,7 @@
     "account-info": "Account info",
     "account-name-input-placeholder": "Account name",
     "network-preferences": "Network preferences",
-    "network-preferences-desc": "Select which networks to receive funds on",
+    "network-preferences-desc": "Select which network this address is happy to receive funds on",
     "layer-2": "Layer 2",
     "manage-tokens": "Manage tokens",
     "edit-derivation-path": "Edit derivation path",
@@ -2389,7 +2387,6 @@
     "edit-wallet-account-emoji-updated-message": "Account emoji has been updated",
     "edit-wallet-account-name-updated-message": "Account name has been updated",
     "edit-wallet-account-colour-updated-message": "Account colour has been updated",
-    "edit-wallet-network-preferences-updated-message": "Account network preferences has been updated",
     "search-assets": "Search assets",
     "address-activity": "This address has activity",
     "keypairs": "Keypairs",

yarn.lock

@@ -2666,9 +2666,10 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@react-native-camera-roll/camera-roll@git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1":
-  version "5.10.0"
-  resolved "git+https://github.com/status-im/react-native-camera-roll.git#174f8c6ad88e5bad9d9bd207f42173e567ec3138"
+"@react-native-camera-roll/camera-roll@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-7.2.0.tgz#e1de34175619048019f766858d3563608c2b3ef8"
+  integrity sha512-7y1lW+b9lpXsqUDCi4Ow0XozVe8OLqN/Pfq6lJpAxbgZ0TEVpVKniQj2ZeLMWsA28eae7JMqGqqj4e9uVp8eOw==
 
 "@react-native-community/audio-toolkit@git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6":
   version "2.0.3"
@@ -9137,10 +9138,10 @@ react-native-fs@^2.14.1:
     base-64 "^0.1.0"
     utf8 "^3.0.0"
 
-react-native-gesture-handler@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.6.1.tgz#66c40c8d720eb4729b301836a40fd34d14ec840f"
-  integrity sha512-0MXjRgNCrsQJSo3B9oXORw5spdm/9dkDbP2JU/3zrVyV9/MnRz5Oo3oy7hREKYWVMF9Gk2UpsCquFLRFQxeSxQ==
+react-native-gesture-handler@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.12.0.tgz#59ca9d97e4c71f70b9c258f14a1a081f4c689976"
+  integrity sha512-rr+XwVzXAVpY8co25ukvyI38fKCxTQjz7WajeZktl8qUPdh1twnSExgpT47DqDi4n+m+OiJPAnHfZOkqqAQMOg==
   dependencies:
     "@egjs/hammerjs" "^2.0.17"
     hoist-non-react-statics "^3.3.0"
@@ -9243,10 +9244,10 @@ react-native-randombytes@^3.5.1, react-native-randombytes@^3.6.1:
     buffer "^4.9.1"
     sjcl "^1.0.3"
 
-react-native-reanimated@3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.5.4.tgz#a6c2b0c43b6dad246f5d276213974afedb8e3fc7"
-  integrity sha512-8we9LLDO1o4Oj9/DICeEJ2K1tjfqkJagqQUglxeUAkol/HcEJ6PGxIrpBcNryLqCDYEcu6FZWld/FzizBIw6bg==
+react-native-reanimated@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.6.1.tgz#5add41efafac6d0befd9786e752e7f26dbe903b7"
+  integrity sha512-F4vG9Yf9PKmE3GaWtVGUpzj3SM6YY2cx1yRHCwiMd1uY7W0gU017LfcVUorboJnj0y5QZqEriEK1Usq2Y8YZqg==
   dependencies:
     "@babel/plugin-transform-object-assign" "^7.16.7"
     "@babel/preset-typescript" "^7.16.7"