chore: commit wip stuff

.clj-kondo/config.edn

@@ -26,7 +26,6 @@
                                                           malli.generator         malli.generator
                                                           malli.transform         malli.transform
                                                           malli.util              malli.util
-                                                          promesa.core            p
                                                           schema.core             schema
                                                           status-im.feature-flags ff
                                                           taoensso.timbre         log}}

.clj-kondo/funcool/promesa/config.edn

@@ -1,9 +0,0 @@
-{:lint-as {promesa.core/->          clojure.core/->
-           promesa.core/->>         clojure.core/->>
-           promesa.core/as->        clojure.core/as->
-           promesa.core/let         clojure.core/let
-           promesa.core/plet        clojure.core/let
-           promesa.core/loop        clojure.core/loop
-           promesa.core/recur       clojure.core/recur
-           promesa.core/with-redefs clojure.core/with-redefs
-           promesa.core/doseq       clojure.core/doseq}}

.zprintrc

@@ -22,37 +22,34 @@
   :multi-lhs-hang]
 
  :fn-map
- {"reg-sub"           :arg1-pair
-  "h/describe"        :arg1-body
-  "h/describe-skip"   :arg1-body
-  "h/describe-only"   :arg1-body
-  "h/test"            :arg1-body
-  "h/test-skip"       :arg1-body
-  "h/test-only"       :arg1-body
-  "test/async"        :arg1-body
-  "test/use-fixtures" :arg1-body
-  "global.describe"   :arg1-body
-  "global.test"       :arg1-body
-  "list-comp"         :binding
-  "defview"           :arg1-body
-  "letsubs"           :binding
-  "with-let"          "let"
-  "reg-event-fx"      :arg1-pair
-  "reg-fx"            :arg1-pair
-  "testing"           :arg1-body
-  "deftest-sub"       :arg1-body
-  "test-async"        :arg1-body
-  "wait-for"          :arg1-body
-  "with-deps-check"   :arg1-body
-  "schema/=>"         :arg1-body
-  "->"                [:noarg1-body
-                       {:list               {:constant-pair? false :force-nl? false}
-                        :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"              "reset!"
-  "assoc-when"        "assoc"
-  "assoc-some"        "assoc"
-  "conj-when"         "conj"
-  "conj-some"         "conj"}
+ {"reg-sub"         :arg1-pair
+  "h/describe"      :arg1-body
+  "h/describe-skip" :arg1-body
+  "h/describe-only" :arg1-body
+  "h/test"          :arg1-body
+  "h/test-skip"     :arg1-body
+  "h/test-only"     :arg1-body
+  "global.describe" :arg1-body
+  "global.test"     :arg1-body
+  "list-comp"       :binding
+  "defview"         :arg1-body
+  "letsubs"         :binding
+  "with-let"        "let"
+  "reg-event-fx"    :arg1-pair
+  "reg-fx"          :arg1-pair
+  "testing"         :arg1-body
+  "deftest-sub"     :arg1-body
+  "wait-for"        :arg1-body
+  "with-deps-check" :arg1-body
+  "schema/=>"       :arg1-body
+  "->"              [:noarg1-body
+                     {:list               {:constant-pair? false :force-nl? false}
+                      :next-inner-restore [[:list :constant-pair?]]}]
+  "set!"            "reset!"
+  "assoc-when"      "assoc"
+  "assoc-some"      "assoc"
+  "conj-when"       "conj"
+  "conj-some"       "conj"}
 
  :style-map
  {:no-comma {:map {:comma? false}}

Makefile

@@ -331,14 +331,13 @@ shadow-server:##@ Start shadow-cljs in server mode for watching
 
 _test-clojure: export TARGET := clojure
 _test-clojure: export WATCH ?= false
-_test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
-	yarn node-pre-gyp rebuild && \
+	yarn install && \
 	yarn shadow-cljs compile mocks && \
 	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
-	yarn node-pre-gyp rebuild && \
+	yarn install && \
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
@@ -351,9 +350,8 @@ test: _test-clojure
 
 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
-test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn node-pre-gyp rebuild
+	yarn install
 	rm -f target/test/test.js
 	yarn shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \

ios/Podfile

@@ -5,7 +5,7 @@ require Pod::Executable.execute_command('node', ['-p',
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 
-platform :ios, '15.0'
+platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
 linkage = ENV['USE_FRAMEWORKS']

ios/Podfile.lock

@@ -466,10 +466,6 @@ PODS:
     - React-CoreModules
     - React-RCTImage
     - React-RCTText
-  - rive-react-native (6.2.0):
-    - React-Core
-    - RiveRuntime (= 5.5.1)
-  - RiveRuntime (5.5.1)
   - RNCAsyncStorage (1.19.3):
     - React-Core
   - RNCClipboard (1.2.2):
@@ -590,7 +586,6 @@ DEPENDENCIES:
   - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)"
   - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
   - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
-  - rive-react-native (from `../node_modules/rive-react-native`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
@@ -617,7 +612,6 @@ SPEC REPOS:
     - fmt
     - HMSegmentedControl
     - libwebp
-    - RiveRuntime
     - SDWebImage
     - SDWebImageWebPCoder
     - SocketRocket
@@ -751,8 +745,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-camera-kit"
   ReactNativeNavigation:
     :path: "../node_modules/react-native-navigation"
-  rive-react-native:
-    :path: "../node_modules/rive-react-native"
   RNCAsyncStorage:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCClipboard:
@@ -808,7 +800,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7
   FBReactNativeSpec: 448e08a759d29a96e15725ae532445bf4343567c
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 553c84c5d721b0d5eee45abc0e1045eff08d0363
+  glog: cf171f517b828fdde711287b723e348da1ea0fc3
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -868,8 +860,6 @@ SPEC CHECKSUMS:
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
   ReactNativeCameraKit: d95d3e19c514526a234d9f93c6db7e7f10eef9ea
   ReactNativeNavigation: 2651d0bc1479e9df0789b077ae93320dc2c9b73b
-  rive-react-native: 82eb809ebec7ab5059982dc1a2b6097c74d722ea
-  RiveRuntime: b57830ff73f406f3b4022f457b16690535ca4d05
   RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb
   RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
   RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6
@@ -894,6 +884,6 @@ SPEC CHECKSUMS:
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
 
-PODFILE CHECKSUM: 5fb780ad69423bc07ecf2830edc197c35b030433
+PODFILE CHECKSUM: 3f98ce893757dfa17e609ef7cd24fa41635b73a6
 
 COCOAPODS: 1.12.0

ios/StatusIm.xcodeproj/project.pbxproj

@@ -346,7 +346,6 @@
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
 				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
-				E12C2C68160526186D75A66F /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -370,7 +369,6 @@
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
 				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
-				39DDA8A9A8650A8882274315 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -393,7 +391,6 @@
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
 				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
-				BC3725905F2B61D1D2349AC3 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -569,24 +566,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		39DDA8A9A8650A8882274315 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/RiveRuntime/RiveRuntime.framework/RiveRuntime",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RiveRuntime.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -659,24 +638,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BC3725905F2B61D1D2349AC3 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/RiveRuntime/RiveRuntime.framework/RiveRuntime",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RiveRuntime.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -743,24 +704,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E12C2C68160526186D75A66F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/RiveRuntime/RiveRuntime.framework/RiveRuntime",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RiveRuntime.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;

ios/StatusIm/Info.plist

@@ -74,6 +74,8 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>Status uses camera to take pictures and scan QR codes.</string>
+	<key>NSLocalNetworkUsageDescription</key>
+        <string>Status needs access to the local network to give you the ability to connect with peers.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

modules/react-native-status/ios/RCTStatus/NetworkManager.m

@@ -4,10 +4,25 @@
 #import "Statusgo.h"
 #import "Utils.h"
 
+@interface NetworkManager() <NSNetServiceBrowserDelegate>
+
+@property (nonatomic, strong) NSNetServiceBrowser *serviceBrowser;
+@property (nonatomic, copy) RCTResponseSenderBlock callback;
+
+@end
+
 @implementation NetworkManager
 
 RCT_EXPORT_MODULE();
 
+- (instancetype)init {
+  if ((self = [super init])) {
+    self.serviceBrowser = [[NSNetServiceBrowser alloc] init];
+    self.serviceBrowser.delegate = self;
+  }
+  return self;
+}
+
 RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
     NSString *result = StatusgoStartSearchForLocalPairingPeers();
     callback(@[result]);
@@ -95,6 +110,39 @@ RCT_EXPORT_METHOD(callPrivateRPC:(NSString *)payload
     });
 }
 
+RCT_EXPORT_METHOD(requestLocalNetworkAccess:(RCTResponseSenderBlock)callback) {
+  self.callback = callback;
+
+  // Start browsing for services using TCP on the local network.
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.serviceBrowser searchForServicesOfType:@"_http._tcp." inDomain:@""];
+  });
+}
+
+// NSNetServiceBrowser delegate method
+- (void)netServiceBrowser:(NSNetServiceBrowser *)browser didNotSearch:(NSDictionary<NSString *,NSNumber *> *)errorDict {
+  RCTLogInfo(@"Failed to search for services: %@", errorDict);
+  if (self.callback) {
+    self.callback(@[@"Failed to search for services"]);
+  }
+}
+
+// NSNetServiceBrowser delegate method
+- (void)netServiceBrowser:(NSNetServiceBrowser *)browser didFindService:(NSNetService *)service moreComing:(BOOL)moreComing {
+  RCTLogInfo(@"Found service: %@", service);
+  // we stop the search after finding the first service or wait until the search is finished.
+  [browser stop];
+
+  if (self.callback) {
+    self.callback(@[[NSNull null], @"Requested local network access and found service"]);
+  }
+}
+
+// NSNetServiceBrowser delegate method
+- (void)netServiceBrowserDidStopSearch:(NSNetServiceBrowser *)browser {
+  RCTLogInfo(@"Stopped searching for services");
+}
+
 #pragma mark - Recover
 
 RCT_EXPORT_METHOD(recover:(NSString *)message

modules/react-native-status/nodejs/status.cpp

@@ -1888,36 +1888,6 @@ void _InitLogging(const FunctionCallbackInfo<Value>& args) {
     delete c;
 }
 
-void _RestoreAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for RestoreAccountAndLogin")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'RestoreAccountAndLogin'")));
-		return;
-	}
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = RestoreAccountAndLogin(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-
 
 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1975,7 +1945,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
 	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
-	NODE_SET_METHOD(exports, "restoreAccountAndLogin", _RestoreAccountAndLogin);
 }
 
 NODE_MODULE(NODE_GYP_MODULE_NAME, init)

nix/deps/clojure/deps.json

@@ -90,20 +90,20 @@
   },
 
   {
-    "path": "cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0",
+    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "1f28a4a834a7a46cf24def971b1a705a6795c73a",
-      "sha256": "0h4pyzy8rzzh567khvimw2cs8jr640kqxgaxvbfx1s5yfp56fka2"
+      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
+      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
     }
   },
 
   {
-    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
+    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
-      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
+      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
+      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
     }
   },
 
@@ -251,6 +251,15 @@
     }
   },
 
+  {
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
+    }
+  },
+
   {
     "path": "com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0",
     "host": "https://repo1.maven.org/maven2",
@@ -297,11 +306,11 @@
   },
 
   {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802",
+    "path": "com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "0a2498a4d45bf5896042f31da0cd30c5e7b415af",
-      "sha256": "0jvgqq0gnvm4jw2zac4677ds05klvsjalszdzcq3nw8g7fjyjv2x"
+      "sha1": "2f5d7ab921f9cc07ffeb4e1c0f156f164c650eeb",
+      "sha256": "0gphdrrhr88bcqa1scndachvhbayh7m11zm9hcsmvzn9bw72pabw"
     }
   },
 
@@ -323,51 +332,6 @@
     }
   },
 
-  {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
-    }
-  },
-
-  {
-    "path": "com/taoensso/encore/3.68.0/encore-3.68.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "b098b58e27a7cf9ab5e46aedbb5ababc12805170",
-      "sha256": "1i5bmm83y9wpgvl5h6ysjsw58qrqz4b4v5vqnsprq6f1pmakjfz2"
-    }
-  },
-
-  {
-    "path": "com/taoensso/timbre/6.3.1/timbre-6.3.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "e1b04be262f38bbd9af8f1193b6b3f2c6a37129d",
-      "sha256": "0p6rws5gpab5qldp739lyqvwdbak28vaxbjw2bg2slflkkahszc7"
-    }
-  },
-
-  {
-    "path": "com/taoensso/truss/1.11.0/truss-1.11.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "4784f43191d5839448b58128bb455d62616086fd",
-      "sha256": "16xqav4cv3cnfik2d8v3wn7zb2a97ybnrbp6v6nj8m1nmdhr16k7"
-    }
-  },
-
-  {
-    "path": "com/taoensso/tufte/2.6.3/tufte-2.6.3",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "8862c6113ca743ebdcfa17bf4779a21fc08a7c7e",
-      "sha256": "0i0wsv2g2hswgdik6zlgcs212clj1d7fvckxfcsmyfr0vvpc1dmd"
-    }
-  },
-
   {
     "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
     "host": "https://repo1.maven.org/maven2",
@@ -404,6 +368,42 @@
     }
   },
 
+  {
+    "path": "com/taoensso/encore/3.68.0/encore-3.68.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "b098b58e27a7cf9ab5e46aedbb5ababc12805170",
+      "sha256": "1i5bmm83y9wpgvl5h6ysjsw58qrqz4b4v5vqnsprq6f1pmakjfz2"
+    }
+  },
+
+  {
+    "path": "com/taoensso/timbre/6.3.1/timbre-6.3.1",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "e1b04be262f38bbd9af8f1193b6b3f2c6a37129d",
+      "sha256": "0p6rws5gpab5qldp739lyqvwdbak28vaxbjw2bg2slflkkahszc7"
+    }
+  },
+
+  {
+    "path": "com/taoensso/truss/1.11.0/truss-1.11.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "4784f43191d5839448b58128bb455d62616086fd",
+      "sha256": "16xqav4cv3cnfik2d8v3wn7zb2a97ybnrbp6v6nj8m1nmdhr16k7"
+    }
+  },
+
+  {
+    "path": "com/taoensso/tufte/2.6.3/tufte-2.6.3",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "8862c6113ca743ebdcfa17bf4779a21fc08a7c7e",
+      "sha256": "0i0wsv2g2hswgdik6zlgcs212clj1d7fvckxfcsmyfr0vvpc1dmd"
+    }
+  },
+
   {
     "path": "crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1",
     "host": "https://repo.clojars.org",
@@ -449,15 +449,6 @@
     }
   },
 
-  {
-    "path": "funcool/promesa/11.0.678/promesa-11.0.678",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0ee1690ba74b2609c2d85b51edacad13046a18e2",
-      "sha256": "1wif8nwdbpchwg56fz47ymjnflmva0fzy0bw1s6bacnac472pmza"
-    }
-  },
-
   {
     "path": "hiccup/hiccup/1.0.5/hiccup-1.0.5",
     "host": "https://repo.clojars.org",
@@ -513,11 +504,11 @@
   },
 
   {
-    "path": "io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final",
+    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "96d1d5ca6406a75a285b95ea8f4b39e0fb2d707e",
-      "sha256": "1s1m5hfhmfr7jsp4bn4c6fhdbgiz72mz0a96494nyhfa0b4lql8l"
+      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
+      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
     }
   },
 
@@ -603,11 +594,11 @@
   },
 
   {
-    "path": "nrepl/nrepl/0.9.0/nrepl-0.9.0",
+    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "49beada131959f08f9a20899affbd1b10c03a668",
-      "sha256": "1phak0479s27ffw9wzz7pi8cqqs6ipsm15dhgw9szxxcfhx529qa"
+      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
+      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
     }
   },
 
@@ -620,15 +611,6 @@
     }
   },
 
-  {
-    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
-      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
-    }
-  },
-
   {
     "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
     "host": "https://repo1.maven.org/maven2",
@@ -639,11 +621,11 @@
   },
 
   {
-    "path": "org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2",
-    "host": "https://repo.clojars.org",
+    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
+    "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "45a05ece33609c3ad26a6ea4e05130560da82306",
-      "sha256": "0pwwqq11rcknpcwbwsbw7pgbgnd7hqiawn0r8yvk14qfwa6p7z46"
+      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
+      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
     }
   },
 
@@ -656,6 +638,15 @@
     }
   },
 
+  {
+    "path": "org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "45a05ece33609c3ad26a6ea4e05130560da82306",
+      "sha256": "0pwwqq11rcknpcwbwsbw7pgbgnd7hqiawn0r8yvk14qfwa6p7z46"
+    }
+  },
+
   {
     "path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0",
     "host": "https://repo1.maven.org/maven2",
@@ -746,15 +737,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
-      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
-    }
-  },
-
   {
     "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
     "host": "https://repo1.maven.org/maven2",
@@ -764,6 +746,15 @@
     }
   },
 
+  {
+    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
+      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
+    }
+  },
+
   {
     "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
     "host": "https://repo1.maven.org/maven2",
@@ -791,15 +782,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
-      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -809,6 +791,15 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
+      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
+    }
+  },
+
   {
     "path": "org/clojure/tools.cli/1.0.206/tools.cli-1.0.206",
     "host": "https://repo1.maven.org/maven2",
@@ -837,11 +828,11 @@
   },
 
   {
-    "path": "org/clojure/tools.reader/1.3.7/tools.reader-1.3.7",
+    "path": "org/clojure/tools.reader/1.3.6/tools.reader-1.3.6",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "c60dfd3d79cbc5ec6264ba45c14b8d4c9b6708b2",
-      "sha256": "1mr0qx3gw1myfls07vrx3arwsi5n95b2lwk74ijpj0z3lzpzlj7m"
+      "sha1": "927809dcb44fa726e4969d993e3e733636d95ebb",
+      "sha256": "1q5q7fmshybvp55f6qys8i5sbzfaix5v9f9b55dkbhv55hgv7l8i"
     }
   },
 
@@ -855,38 +846,38 @@
   },
 
   {
-    "path": "org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final",
+    "path": "org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "c4bd7e12a745c0e7f6cf98c45cdcdf482fd827ea",
-      "sha256": "0jdcziqbdzmah981zv3q88k2zrnclr2h1k3h3vjn002m9p54qchb"
+      "sha1": "40fd4d696c55793e996d1ff3c475833f836c2498",
+      "sha256": "1f7f4kjn3v6vibhgsr3k8hl0r2xq0c2rbcl82dx0bqg5jdyqgzlf"
     }
   },
 
   {
-    "path": "org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final",
+    "path": "org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "dd23d4788b3eafe9597ef3fe028e46ceb293ba8d",
-      "sha256": "1cchp54dw1578my27siim3h5jbf240aq8q6xd3z2b1ajgxxbcl71"
+      "sha1": "9b260c0302f637a84a52d3d118214a3c59217615",
+      "sha256": "0yc0p71y7yjhqjhkvqqi9xqgljavp3aslnik2k7dppbxnkrnlff9"
     }
   },
 
   {
-    "path": "org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final",
+    "path": "org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "1ba9c8b9a8dea1c6cd656155943e6d4c2c631fa7",
-      "sha256": "0wvqdcbardi55l77aw5404qgw70384hw155xvc66shn7l6z8h6bh"
+      "sha1": "e2c29acf42ac6f42c34f0b74ba089e3f3d1b2394",
+      "sha256": "041qnvb74bkgmfxyd23vdl26il55cmfbhi6a4bm3fcmyrpapjfjl"
     }
   },
 
   {
-    "path": "org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final",
+    "path": "org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "a5d2faf8d02e0a0bb9e9eabca8e38173cb640331",
-      "sha256": "0pxw2iv1q1yzk39knc650rg4vflsyjzhf07mwm2s5aqn5h82sk3i"
+      "sha1": "90c57dcf7f8c846b4da331d0e6e048c39842c92a",
+      "sha256": "1zndnb5648wqw23gj80zjqk3yd8gq6grqhz9n4zrcqixx1z586jf"
     }
   },
 
@@ -918,20 +909,11 @@
   },
 
   {
-    "path": "org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9",
+    "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "7cf2726fdcfbc8610f9a71fb3ed639871f315340",
-      "sha256": "0v1b7iydpnh2rvyzqvqbqm19vr2qva8icq84690bppnpr06r6608"
-    }
-  },
-
-  {
-    "path": "org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "fa0627049304bf501bf6a0e4d1416bcaec9a72a9",
-      "sha256": "10vdg9qkailjbzmf5mfnv328675swmnf1x3g9v7ymhxs29xkc4jn"
+      "sha1": "6c62681a2f655b49963a5983b8b0950a6120ae14",
+      "sha256": "1h512ry8g0nriazg3dqzs6s96502a77drw8vq26nfya97rg5gvyk"
     }
   },
 
@@ -945,11 +927,11 @@
   },
 
   {
-    "path": "org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final",
+    "path": "org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "735ceee5616d5143bac1bc740e444697073c002f",
-      "sha256": "0sp48y3q7bmp3bjb7a6fpz8gb7ssizvxlw5wdv2xwa6mifpkrnlz"
+      "sha1": "8eba40cfe86bcfcc223551e75201e6e7574c7c36",
+      "sha256": "17rkkm9dqbxdzpamwl9jr8z285awsj6hzpavzmc87wcz9469hp5b"
     }
   },
 
@@ -962,6 +944,15 @@
     }
   },
 
+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
   {
     "path": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -971,6 +962,15 @@
     }
   },
 
+  {
+    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
+      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+    }
+  },
+
   {
     "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
     "host": "https://repo.clojars.org",
@@ -998,24 +998,6 @@
     }
   },
 
-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
-  {
-    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
-      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
-    }
-  },
-
   {
     "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
     "host": "https://repo.clojars.org",
@@ -1053,11 +1035,11 @@
   },
 
   {
-    "path": "thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot",
+    "path": "thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "ab6b31649cb03e352369698781207db4f6da6d5f",
-      "sha256": "0mh28nykpillkym7hvplrr7vy5hn6a2ymafyf4yfl5y2kfx4yq42"
+      "sha1": "013921db91ce4a3616aec9c72c1832a014a0fece",
+      "sha256": "0ks380z7h8i2ylirvjgmlicq9jjpz9w71gjv521h4xs5fb273cl0"
     }
   },
 
@@ -1071,11 +1053,11 @@
   },
 
   {
-    "path": "thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3",
+    "path": "thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "ba377c3b70fd942b3ca7e38f055412a441626711",
-      "sha256": "10w2slj4znm93j0qq3ldj9hj0i7a50vbnmn6kv8i77fakikdjc48"
+      "sha1": "9be444bea4037bb80b451cc52a8e80359c4c45be",
+      "sha256": "174s2rdxvp7d4jg9kvzjadps42bdsbi05rs2pjy5i0ssq9n23zwa"
     }
   },
 

nix/deps/clojure/deps.list

@@ -8,8 +8,8 @@ borkdude/edamame/1.3.23/edamame-1.3.23.jar
 borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
-cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0.jar
-cider/piggieback/0.5.2/piggieback-0.5.2.jar
+cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
+cider/piggieback/0.4.1/piggieback-0.4.1.jar
 clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
@@ -26,36 +26,35 @@ com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
 com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
 com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
 com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
 com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
-com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar
+com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411.jar
 com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
 com/google/re2j/re2j/1.3/re2j-1.3.jar
-com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
-com/taoensso/encore/3.68.0/encore-3.68.0.jar
-com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
-com/taoensso/truss/1.11.0/truss-1.11.0.jar
-com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 commons-codec/commons-codec/1.15/commons-codec-1.15.jar
 commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
 commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
 compojure/compojure/1.5.2/compojure-1.5.2.jar
+com/taoensso/encore/3.68.0/encore-3.68.0.jar
+com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
+com/taoensso/truss/1.11.0/truss-1.11.0.jar
+com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
 crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
 expound/expound/0.9.0/expound-0.9.0.jar
 fipp/fipp/0.6.26/fipp-0.6.26.jar
-funcool/promesa/11.0.678/promesa-11.0.678.jar
 hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/1.4.4/pretty-1.4.4.jar
 io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1.jar
 io/replikativ/datalog-parser/0.2.25/datalog-parser-0.2.25.jar
-io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final.jar
+io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
 javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
@@ -65,12 +64,12 @@ mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
-nrepl/nrepl/0.9.0/nrepl-0.9.0.jar
+nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
 nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
-org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
-org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
+org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/babashka/sci/0.7.38/sci-0.7.38.jar
+org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
 org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
 org/clojure/clojure/1.11.1/clojure-1.11.1.jar
 org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
@@ -81,42 +80,41 @@ org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
 org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
 org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
-org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
 org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 org/clojure/test.check/1.1.1/test.check-1.1.1.jar
-org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
+org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
 org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
-org/clojure/tools.reader/1.3.7/tools.reader-1.3.7.jar
+org/clojure/tools.reader/1.3.6/tools.reader-1.3.6.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
-org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar
-org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final.jar
-org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final.jar
-org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final.jar
+org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar
+org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final.jar
+org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
+org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
 org/jspecify/jspecify/0.2.0/jspecify-0.2.0.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
 org/ow2/asm/asm/9.4/asm-9.4.jar
-org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
-org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9.jar
+org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
-org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final.jar
+org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
+refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
-refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
 ring/ring-core/1.9.6/ring-core-1.9.6.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot.jar
+thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot.jar
 thheller/shadow-cljsjs/0.0.22/shadow-cljsjs-0.0.22.jar
-thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3.jar
+thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 tigris/tigris/0.1.2/tigris-0.1.2.jar

nix/scripts/node_modules.sh

@@ -53,14 +53,6 @@ copyNodeModules() {
 
 # Find files that were modified and should cause a re-copying of node modules.
 # Some files are generated/modified by build processes and should be ignored.
-#
-# react-native/ReactCommon/react/renderer/components/rncore/*
-# generated at runtime by react-native
-# related code https://github.com/facebook/react-native/blob/v0.72.5/packages/react-native/ReactCommon/React-rncore.podspec#L19
-#
-# react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m
-# generated at runtime by react-native-config
-# related code https://github.com/lugg/react-native-config/blob/v1.5.0/react-native-config.podspec#L52
 findFilesNewerThan() {
   local sentinel="${1}"
   local dir="${2}"
@@ -69,8 +61,6 @@ findFilesNewerThan() {
       -not -ipath "*/*android/build/*" -prune \
       -not -ipath "*/xcuserdata/*" -prune \
       -not -ipath "*/scripts/.packager.env" \
-      -not -path "*/node_modules/react-native/ReactCommon/react/renderer/components/rncore/*" \
-      -not -path "*/node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m" \
       -print
 }
 

package.json

@@ -69,7 +69,6 @@
     "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
     "react-native-webview": "13.6.3",
     "react-syntax-highlighter": "^15.5.0",
-    "rive-react-native": "^6.2.0",
     "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
   },

shadow-cljs.edn

@@ -10,7 +10,6 @@
                 [com.cognitect/transit-cljs "0.8.280"]
                 [camel-snake-kebab "0.4.3"]
                 [metosin/malli "0.13.0"]
-                [funcool/promesa "11.0.678"]
 
                 ;; Dev dependencies
                 [refactor-nrepl "3.9.1"]

src/js/worklets/chat/messenger/messages.js

@@ -1,5 +1,4 @@
-import { useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated';
-import { useState } from "react"
+import { withTiming, runOnJS } from 'react-native-reanimated';
 
 export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
   return function (event) {
@@ -13,17 +12,3 @@ export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callb
     runOnJS(callback)(layoutHeight, newDistance);
   };
 }
-
-export function useMessagesScrolledToThreshold(distanceFromListTop, threshold) {
-    const [scrolledToThreshold, setScrolledToThreshold] = useState(false)
-
-    useAnimatedReaction(function () {
-	return distanceFromListTop.value <= threshold;
-    }, function (current) {
-	if(current !== scrolledToThreshold) {
-	    runOnJS(setScrolledToThreshold)(current)
-	}
-    }, [scrolledToThreshold])
-
-    return scrolledToThreshold
-}

src/js/worklets/chat/messenger/navigation.js

@@ -19,13 +19,6 @@ export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBa
   });
 }
 
-export function navigationButtonsCompleteOpacity(isCalculationComplete) {
-    return useDerivedValue(function () {
-	'worklet'
-	return isCalculationComplete.value ? withTiming(1) : 0
-    })
-}
-
 export function interpolateNavigationViewOpacity(props) {
   return useDerivedValue(function () {
     'worklet';

src/legacy/status_im/browser/core.cljs

@@ -3,6 +3,7 @@
     ["eth-phishing-detect" :as eth-phishing-detect]
     [clojure.string :as string]
     [legacy.status-im.bottom-sheet.events :as bottom-sheet]
+    [legacy.status-im.browser.eip3085 :as eip3085]
     [legacy.status-im.browser.eip3326 :as eip3326]
     [legacy.status-im.browser.permissions :as browser.permissions]
     [legacy.status-im.browser.webview-ref :as webview-ref]
@@ -15,7 +16,6 @@
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [react-native.platform :as platform]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.common.universal-links :as links]
     [status-im.constants :as constants]
     [status-im.contexts.chat.events :as chat.events]
@@ -443,6 +443,9 @@
         (= method "wallet_switchEthereumChain")
         (eip3326/handle-switch-ethereum-chain cofx dapp-name id message-id (first params))
 
+        (= method "wallet_addEthereumChain")
+        (eip3085/handle-add-ethereum-chain cofx dapp-name id message-id (first params))
+
         :else
         {:browser/call-rpc [payload
                             #(re-frame/dispatch [:browser.callback/call-rpc
@@ -655,11 +658,12 @@
                           stored-bookmarks)]
     {:db (assoc db :bookmarks/bookmarks bookmarks)}))
 
-(re-frame/reg-fx :browser/initialize-browser
- (fn []
-   (json-rpc/call {:method     "wakuext_getBrowsers"
-                   :on-success [::initialize-browsers]})
-   (json-rpc/call {:method     "browsers_getBookmarks"
-                   :on-success [::initialize-bookmarks]})
-   (json-rpc/call {:method     "permissions_getDappPermissions"
-                   :on-success [::initialize-dapp-permissions]})))
+(rf/defn initialize-browser
+  [_]
+  {:json-rpc/call
+   [{:method     "wakuext_getBrowsers"
+     :on-success #(re-frame/dispatch [::initialize-browsers %])}
+    {:method     "browsers_getBookmarks"
+     :on-success #(re-frame/dispatch [::initialize-bookmarks %])}
+    {:method     "permissions_getDappPermissions"
+     :on-success #(re-frame/dispatch [::initialize-dapp-permissions %])}]})

src/legacy/status_im/browser/eip3085.cljs

@@ -2,6 +2,10 @@
 ;(`wallet_addEthereumChain`)
 (ns legacy.status-im.browser.eip3085
   (:require
+    [clojure.string :as string]
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet]
+    [legacy.status-im.utils.random :as random]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
     [taoensso.timbre :as log]
@@ -36,3 +40,37 @@
                                         :message "User rejected the request."}}
    :dispatch               [:bottom-sheet/hide-old]})
 
+(rf/defn handle-add-ethereum-chain
+  {:events [:eip3085/handle-add-ethereum-chain]}
+  [{{:networks/keys [networks] :as db} :db :as cofx}
+   dapp-name id message-id
+   {:keys [chainId blockExplorerUrls chainName iconUrls nativeCurrency rpcUrls] :as params}]
+  (let [manage {:name       {:value chainName}
+                :symbol     {:value (:symbol nativeCurrency)}
+                :url        {:value (first rpcUrls)}
+                :network-id {:value chainId}
+                :chain      {:value :custom}}]
+    (if (network/valid-manage? manage)
+      (let [{:keys [name url chain network-id symbol]} manage
+            random-id                                  (string/replace (random/id) "-" "")
+            network                                    (network/new-network random-id
+                                                                            (:value name)
+                                                                            (:value symbol)
+                                                                            (:value url)
+                                                                            (:value chain)
+                                                                            (:value network-id))
+            new-networks                               (assoc networks random-id network)
+            params                                     (assoc params
+                                                              :new-networks new-networks
+                                                              :id           id
+                                                              :new-network  network)]
+        (if (network/chain-id-available? networks network)
+          {:dispatch [:bottom-sheet/show-sheet-old
+                      {:content (fn []
+                                  [sheet/permissions-panel dapp-name message-id params])}]}
+          (send-success-call-to-bridge cofx id message-id)))
+      {:browser/send-to-bridge {:type      constants/web3-send-async-callback
+                                :messageId message-id
+                                :error     {:code    -32602
+                                            :message "invalid network parameters"}}})))
+

src/legacy/status_im/communities/core.cljs

@@ -4,6 +4,7 @@
     [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     legacy.status-im.communities.e2e
     [re-frame.core :as re-frame]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
@@ -83,12 +84,13 @@
             (navigation/navigate-back)
             (handle-response response-js)))
 
-(re-frame/reg-event-fx ::member-banned
- (fn [{:keys [db]} [response-js]]
-   {:db (assoc db :bottom-sheet/show? false)
-    :fx [[:dismiss-bottom-sheet-overlay-old]
-         [:sanitize-messages-and-process-response response-js]
-         [:activity-center.notifications/fetch-unread-count]]}))
+(rf/defn member-banned
+  {:events [::member-banned]}
+  [cofx response-js]
+  (rf/merge cofx
+            (bottom-sheet/hide-bottom-sheet-old)
+            (handle-response response-js)
+            (activity-center/notifications-fetch-unread-count)))
 
 (rf/defn member-ban
   {:events [::member-ban]}

src/legacy/status_im/contact/block.cljs

@@ -6,6 +6,7 @@
     [re-frame.core :as re-frame]
     [status-im.contexts.chat.contacts.events :as contacts-store]
     [status-im.contexts.chat.messenger.messages.list.events :as message-list]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [utils.re-frame :as rf]))
 
@@ -44,16 +45,16 @@
     (apply
      rf/merge
      cofx
-     {:db (->
-            db
-            (update :chats dissoc public-key)
-            (update :chats-home-list disj public-key)
-            (assoc-in [:contacts/contacts public-key
-                       :added?]
-                      false))
-      :fx [[:activity-center.notifications/fetch-unread-count]
-           [:effects/push-notifications-clear-message-notifications [public-key]]
-           [:dispatch [:shell/close-switcher-card public-key]]]}
+     {:db                                                     (->
+                                                                db
+                                                                (update :chats dissoc public-key)
+                                                                (update :chats-home-list disj public-key)
+                                                                (assoc-in [:contacts/contacts public-key
+                                                                           :added?]
+                                                                          false))
+      :dispatch                                               [:shell/close-switcher-card public-key]
+      :effects/push-notifications-clear-message-notifications [public-key]}
+     (activity-center/notifications-fetch-unread-count)
      fxs)))
 
 (rf/defn block-contact

src/legacy/status_im/contact/db.cljs

@@ -45,12 +45,12 @@
     (query-fn (comp participant-set :public-key) (vals all-contacts))))
 
 (defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
+  [members admins contacts {:keys [public-key preferred-name name] :as current-account}]
   (let [current-contact (some->
                           current-account
-                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
+                          (select-keys [:name :preferred-name :public-key :images])
                           (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or display-name preferred-name name)))
+                          (assoc :primary-name (or preferred-name name)))
         all-contacts    (cond-> contacts
                           current-contact
                           (assoc public-key current-contact))]

src/legacy/status_im/data_store/activities_test.cljs

@@ -29,41 +29,37 @@
 
   (testing "transforms messages from RPC response"
     (is
-     (= {:last-message  {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :bridge-message       nil
-                         :outgoing             false}
+     (= {:last-message  {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}
          :message       nil
-         :reply-message {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :bridge-message       nil
-                         :outgoing             false}}
+         :reply-message {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}}
         (-> raw-notification
             store/<-rpc
             (select-keys [:last-message :message :reply-message])))))

src/legacy/status_im/data_store/chats.cljs

@@ -3,10 +3,9 @@
     [clojure.set :as set]
     [legacy.status-im.data-store.messages :as messages]
     [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.constants :as constants]
-    [taoensso.timbre :as log]))
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
 
 (defn rpc->type
   [{:keys [chat-type name] :as chat}]
@@ -118,10 +117,10 @@
       rpc->type
       unmarshal-members))
 
-(re-frame/reg-fx :fetch-chats-preview
- (fn [{:keys [on-success]}]
-   (json-rpc/call {:method      "wakuext_chatsPreview"
-                   :params      []
-                   :js-response true
-                   :on-success  #(on-success ^js %)
-                   :on-error    #(log/error "failed to fetch chats" 0 -1 %)})))
+(rf/defn fetch-chats-preview
+  [_ {:keys [on-success]}]
+  {:json-rpc/call [{:method      "wakuext_chatsPreview"
+                    :params      []
+                    :js-response true
+                    :on-success  #(on-success ^js %)
+                    :on-error    #(log/error "failed to fetch chats" 0 -1 %)}]})

src/legacy/status_im/data_store/communities.cljs

@@ -4,6 +4,13 @@
     [clojure.walk :as walk]
     [status-im.constants :as constants]))
 
+(defn rpc->channel-permissions
+  [rpc-channels-permissions]
+  (update-vals rpc-channels-permissions
+               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
+                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
+                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
+
 (defn <-revealed-accounts-rpc
   [accounts]
   (mapv
@@ -27,9 +34,8 @@
                (assoc acc
                       (name k)
                       (-> v
-                          (assoc :token-gated? (:tokenGated v)
-                                 :can-post?    (:canPost v))
-                          (dissoc :canPost :tokenGated)
+                          (assoc :can-post? (:canPost v))
+                          (dissoc :canPost)
                           (update :members walk/stringify-keys))))
              {}
              chats))

src/legacy/status_im/data_store/communities_test.cljs

@@ -0,0 +1,23 @@
+(ns legacy.status-im.data-store.communities-test
+  (:require
+    [cljs.test :refer [deftest is]]
+    [legacy.status-im.data-store.communities :as sut]))
+
+(def permissions
+  {"community-id-chat-1"
+   {:viewOnlyPermissions    {:satisfied   false
+                             :permissions {:token-permission-id-01 {:criteria [false]}}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}
+   "community-id-chat-2"
+   {:viewOnlyPermissions    {:satisfied true :permissions {}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}})
+
+(deftest rpc->channel-permissions-test
+  (is (= {"community-id-chat-1"
+          {:view-only     {:satisfied?  false
+                           :permissions {:token-permission-id-01 {:criteria [false]}}}
+           :view-and-post {:satisfied? true :permissions {}}}
+          "community-id-chat-2"
+          {:view-only     {:satisfied? true :permissions {}}
+           :view-and-post {:satisfied? true :permissions {}}}}
+         (sut/rpc->channel-permissions permissions))))

src/legacy/status_im/data_store/messages.cljs

@@ -16,41 +16,13 @@
                       :community-id      :communityId
                       :clock-value       :clock})))
 
-(defn- <-status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:communityId        :community-id
-               :displayName        :display-name
-               :membersCount       :members-count
-               :activeMembersCount :active-members-count})
-      (update-in [:community :banner] set/rename-keys {:dataUri :data-uri})
-      (update-in [:community :icon] set/rename-keys {:dataUri :data-uri})))
-
-(defn ->status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:community-id         :communityId
-               :display-name         :displayName
-               :members-count        :membersCount
-               :active-members-count :activeMembersCount})
-      (update-in [:community :banner] set/rename-keys {:data-uri :dataUri})
-      (update-in [:community :icon] set/rename-keys {:data-uri :dataUri})))
-
 (defn- <-link-preview-rpc
   [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:dataUri :data-uri})
-      (update :favicon set/rename-keys {:dataUri :data-uri})))
+  (update preview :thumbnail set/rename-keys {:dataUri :data-uri}))
 
 (defn ->link-preview-rpc
   [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:data-uri :dataUri})
-      (update :favicon set/rename-keys {:data-uri :dataUri})))
+  (update preview :thumbnail set/rename-keys {:data-uri :dataUri}))
 
 (defn <-rpc
   [message]
@@ -81,16 +53,8 @@
         :new                      :new?
         :albumImagesCount         :album-images-count
         :displayName              :display-name
-        :linkPreviews             :link-previews
-        :statusLinkPreviews       :status-link-previews
-        :bridgeMessage            :bridge-message})
-      (update :bridge-message
-              set/rename-keys
-              {:bridgeName :bridge-name
-               :userName   :user-name
-               :userAvatar :user-avatar})
+        :linkPreviews             :link-previews})
       (update :link-previews #(map <-link-preview-rpc %))
-      (update :status-link-previews #(map <-status-link-previews-rpc %))
       (update :quoted-message
               set/rename-keys
               {:parsedText       :parsed-text

src/legacy/status_im/data_store/messages_test.cljs

@@ -21,7 +21,6 @@
                                                  :image       nil
                                                  :response-to "a"
                                                  :links       nil}
-                    :bridge-message             nil
                     :whisper-timestamp          1
                     :contact-verification-state 1
                     :contact-request-state      2
@@ -38,19 +37,7 @@
                     :compressed-key             "c"
                     :timestamp                  3
                     :link-previews              [{:thumbnail {:url      "http://localhost"
-                                                              :data-uri "data:image/png"}
-                                                  :favicon   nil}]
-                    :status-link-previews       [{:url       "http://localhost"
-                                                  :community {:community-id "0x01"
-                                                              :display-name "Test Comm"
-                                                              :members-count 12
-                                                              :active-members-count 12
-                                                              :banner
-                                                              {:data-uri
-                                                               "data:image/png"}
-                                                              :icon
-                                                              {:data-uri
-                                                               "data:image/png"}}}]}
+                                                              :data-uri "data:image/png"}}]}
           message  {:id                       message-id
                     :whisperTimestamp         1
                     :parsedText               "parsed-text"
@@ -74,17 +61,5 @@
                     :timestamp                3
                     :outgoingStatus           "sending"
                     :linkPreviews             [{:thumbnail {:url     "http://localhost"
-                                                            :dataUri "data:image/png"}
-                                                :favicon   nil}]
-                    :statusLinkPreviews       [{:url       "http://localhost"
-                                                :community {:communityId "0x01"
-                                                            :displayName "Test Comm"
-                                                            :membersCount 12
-                                                            :activeMembersCount 12
-                                                            :banner
-                                                            {:dataUri
-                                                             "data:image/png"}
-                                                            :icon
-                                                            {:dataUri
-                                                             "data:image/png"}}}]}]
+                                                            :dataUri "data:image/png"}}]}]
       (is (= expected (m/<-rpc message))))))

src/legacy/status_im/data_store/switcher_cards.cljs

@@ -2,8 +2,6 @@
   (:require
     [clojure.set :as set]
     [clojure.walk :as walk]
-    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
@@ -34,11 +32,11 @@
                     :on-success #()
                     :on-error   #()}]})
 
-(re-frame/reg-fx :switcher-cards/fetch
- (fn []
-   (json-rpc/call {:method     "wakuext_switcherCards"
-                   :params     []
-                   :on-success #(rf/dispatch
-                                 [:shell/switcher-cards-loaded
-                                  (:switcherCards ^js %)])
-                   :on-error   #(log/error "Failed to fetch switcher cards" %)})))
+(rf/defn fetch-switcher-cards-rpc
+  [_]
+  {:json-rpc/call [{:method     "wakuext_switcherCards"
+                    :params     []
+                    :on-success #(rf/dispatch
+                                  [:shell/switcher-cards-loaded
+                                   (:switcherCards ^js %)])
+                    :on-error   #(log/error "Failed to fetch switcher cards" %)}]})

src/legacy/status_im/data_store/visibility_status_updates.cljs

@@ -2,8 +2,8 @@
   (:require
     [clojure.set :as set]
     [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
-    [taoensso.timbre :as log]))
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
 
 (defn <-rpc
   [visibility-status-update]
@@ -18,13 +18,13 @@
        {:current-user-status :current-user-visibility-status})
       (update :current-user-visibility-status <-rpc)))
 
-(re-frame/reg-fx :visibility-status-updates/fetch
- (fn []
-   (json-rpc/call {:method     "wakuext_statusUpdates"
-                   :params     []
-                   :on-success #(re-frame/dispatch
-                                 [:visibility-status-updates/visibility-status-updates-loaded
-                                  (:statusUpdates ^js %)])
-                   :on-error   #(log/error
-                                 "failed to fetch visibility-status-updates"
-                                 %)})))
+(rf/defn fetch-visibility-status-updates-rpc
+  [_]
+  {:json-rpc/call [{:method     "wakuext_statusUpdates"
+                    :params     []
+                    :on-success #(re-frame/dispatch
+                                  [:visibility-status-updates/visibility-status-updates-loaded
+                                   (:statusUpdates ^js %)])
+                    :on-error   #(log/error
+                                  "failed to fetch visibility-status-updates"
+                                  %)}]})

src/legacy/status_im/ethereum/transactions/core.cljs

@@ -239,7 +239,7 @@
 
 (rf/defn tx-history-end-reached
   [{:keys [db] :as cofx} address]
-  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? db)]
+  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? cofx)]
     {:db (assoc-in db
           [:wallet-legacy :fetching address :all-fetched?]
           (if syncing-allowed?
@@ -327,7 +327,7 @@
       {:chain-tokens      (:wallet-legacy/all-tokens db)
        :addresses         [address]
        :before-block      min-known-block
-       :fetch-more?       (utils.mobile-sync/syncing-allowed? db)
+       :fetch-more?       (utils.mobile-sync/syncing-allowed? cofx)
        ;; Transfers are requested before and including `min-known-block` because there is no
        ;; guarantee that all transfers from that block are shown already. To make sure that we fetch
        ;; the whole `default-transfers-limit` of transfers the number of transfers already received

src/legacy/status_im/events.cljs

@@ -8,16 +8,11 @@
     legacy.status-im.chat.models.loading
     legacy.status-im.contact.block
     legacy.status-im.currency.core
-    legacy.status-im.data-store.chats
-    legacy.status-im.data-store.switcher-cards
-    legacy.status-im.data-store.visibility-status-updates
     legacy.status-im.fleet.core
-    legacy.status-im.group-chats.core
     [legacy.status-im.keycard.core :as keycard]
     legacy.status-im.log-level.core
     legacy.status-im.mailserver.constants
     [legacy.status-im.mailserver.core :as mailserver]
-    legacy.status-im.mobile-sync-settings.core
     legacy.status-im.multiaccounts.login.core
     legacy.status-im.multiaccounts.logout.core
     [legacy.status-im.multiaccounts.model :as multiaccounts.model]
@@ -42,6 +37,7 @@
     [react-native.core :as rn]
     [react-native.permissions :as permissions]
     [react-native.platform :as platform]
+    [status-im.common.biometric.events :as biometric]
     status-im.common.serialization
     status-im.common.standard-authentication.events
     [status-im.common.theme.core :as theme]
@@ -124,7 +120,7 @@
       :content             (i18n/label :t/biometric-auth-confirm-message)
       :confirm-button-text (i18n/label :t/biometric-auth-confirm-try-again)
       :cancel-button-text  (i18n/label :t/biometric-auth-confirm-logout)
-      :on-accept           #(rf/dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}])
+      :on-accept           #(biometric/authenticate nil {:on-fail on-biometric-auth-fail})
       :on-cancel           #(re-frame/dispatch [:multiaccounts.logout.ui/logout-confirmed])})))
 
 (rf/defn on-return-from-background
@@ -146,7 +142,7 @@
               #(when-let [chat-id (:current-chat-id db)]
                  {:dispatch [:chat/mark-all-as-read chat-id]})
               #(when requires-bio-auth
-                 {:dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}]}))))
+                 (biometric/authenticate % {:on-fail on-biometric-auth-fail})))))
 
 (rf/defn on-going-in-background
   [{:keys [db now]}]

src/legacy/status_im/group_chats/core.cljs

@@ -6,9 +6,9 @@
     [legacy.status-im.data-store.invitations :as data-store.invitations]
     [oops.core :as oops]
     [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.constants :as constants]
     [status-im.contexts.chat.events :as chat.events]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -19,13 +19,15 @@
   (when (get-in cofx [:db :chats chat-id])
     (chat.events/pop-to-root-and-navigate-to-chat cofx chat-id nil)))
 
-(re-frame/reg-event-fx :chat-removed
- (fn [{:keys [db]} [response chat-id]]
-   {:db (dissoc db :current-chat-id)
-    :fx [[:dispatch [:shell/close-switcher-card chat-id]]
-         [:dispatch [:sanitize-messages-and-process-response response]]
-         [:dispatch [:pop-to-root :shell-stack]]
-         [:activity-center.notifications/fetch-unread-count]]}))
+(rf/defn handle-chat-removed
+  {:events [:chat-removed]}
+  [cofx response chat-id]
+  (rf/merge cofx
+            {:db         (dissoc (:db cofx) :current-chat-id)
+             :dispatch-n [[:shell/close-switcher-card chat-id]
+                          [:sanitize-messages-and-process-response response]
+                          [:pop-to-root :shell-stack]]}
+            (activity-center/notifications-fetch-unread-count)))
 
 (rf/defn handle-chat-update
   {:events [:chat-updated]}
@@ -262,7 +264,8 @@
                       {}
                       invitations))})
 
-(re-frame/reg-fx :group-chats/get-group-chat-invitations
- (fn []
-   (json-rpc/call {:method     "wakuext_getGroupChatInvitations"
-                   :on-success [::initialize-invitations]})))
+(rf/defn get-group-chat-invitations
+  [_]
+  {:json-rpc/call
+   [{:method     "wakuext_getGroupChatInvitations"
+     :on-success #(re-frame/dispatch [::initialize-invitations %])}]})

src/legacy/status_im/mailserver/core.cljs

@@ -5,7 +5,6 @@
     [legacy.status-im.node.core :as node]
     [legacy.status-im.utils.mobile-sync :as mobile-network-utils]
     [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
@@ -62,7 +61,7 @@
            (dissoc :mailserver/current-request :mailserver/fetching-gaps-in-progress))})
 
 (defn fetch-use-mailservers?
-  [db]
+  [{:keys [db]}]
   (get-in db [:profile/profile :use-mailservers?]))
 
 (defonce showing-connection-error-popup? (atom false))
@@ -118,32 +117,24 @@
   [{:keys [db] :as cofx}]
   {:db (dissoc db :mailserver/current-request)})
 
-(defn needs-to-fetch-historic-messages?
-  [db]
-  (and
-   (:messenger/started? db)
-   (mobile-network-utils/syncing-allowed? db)
-   (fetch-use-mailservers? db)
-   (not (:mailserver/current-request db))))
-
 (rf/defn process-next-messages-request
   {:events [::request-messages]}
-  [{:keys [db]}]
-  (when (needs-to-fetch-historic-messages? db)
-    {:db                                       (assoc db :mailserver/current-request true)
-     :mailserver/request-all-historic-messages nil}))
-
-(re-frame/reg-fx :mailserver/request-all-historic-messages
- (fn []
-   (json-rpc/call {:method      "wakuext_requestAllHistoricMessagesWithRetries"
-                   :params      [false]
-                   :js-response true
-                   :on-success  #(do
-                                   (log/info "fetched historical messages")
-                                   (re-frame/dispatch [::request-success %]))
-                   :on-error    #(do
-                                   (log/error "failed retrieve historical messages" %)
-                                   (re-frame/dispatch [::request-error]))})))
+  [{:keys [db now] :as cofx}]
+  (when (and
+         (:messenger/started? db)
+         (mobile-network-utils/syncing-allowed? cofx)
+         (fetch-use-mailservers? cofx)
+         (not (:mailserver/current-request db)))
+    {:db            (assoc db :mailserver/current-request true)
+     :json-rpc/call [{:method      "wakuext_requestAllHistoricMessagesWithRetries"
+                      :params      [false]
+                      :js-response true
+                      :on-success  #(do
+                                      (log/info "fetched historical messages")
+                                      (re-frame/dispatch [::request-success %]))
+                      :on-error    #(do
+                                      (log/error "failed retrieve historical messages" %)
+                                      (re-frame/dispatch [::request-error]))}]}))
 
 (rf/defn handle-mailserver-changed
   [{:keys [db] :as cofx} ms]

src/legacy/status_im/mobile_sync_settings/core.cljs

@@ -5,7 +5,7 @@
     [legacy.status-im.multiaccounts.model :as multiaccounts.model]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [legacy.status-im.utils.mobile-sync :as utils]
-    [re-frame.core :as re-frame]
+    [status-im.contexts.chat.home.add-new-contact.events :as add-new-contact]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
@@ -18,24 +18,27 @@
                 (or (nil? remember-choice?)
                     remember-choice?))}))
 
-(re-frame/reg-event-fx :mobile-network/on-network-status-change
- (fn [{:keys [db]}]
-   (let [previously-initialized?  (get db :network-status/initialized?)
-         logged-in?               (multiaccounts.model/logged-in? db)
-         fetch-historic-messages? (mailserver/needs-to-fetch-historic-messages? db)]
-     (if logged-in?
-       {:db (cond-> (-> db
-                        (assoc :network-status/initialized? true)
-                        (assoc :bottom-sheet/show? false))
-              fetch-historic-messages?
-              (assoc :mailserver/current-request true))
-        :fx [(when fetch-historic-messages?
-               [:mailserver/request-all-historic-messages])
-             [:dismiss-bottom-sheet-overlay-old]
-             (when previously-initialized?
-               (let [new-identity-input (get-in db [:contacts/new-identity :input])]
-                 [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
-       {:db (assoc db :network-status/initialized? true)}))))
+(rf/defn on-network-status-change
+  [{:keys [db] :as cofx}]
+  (let [initialized?                       (get db :network-status/initialized?)
+        logged-in?                         (multiaccounts.model/logged-in? db)
+        {:keys [remember-syncing-choice?]} (:profile/profile db)]
+    (apply
+     rf/merge
+     cofx
+     {:db (assoc db :network-status/initialized? true)}
+     (cond
+       ;; NOTE(rasom): When we log into account on-network-status-change is
+       ;; dispatched, but that doesn't mean there was a status change, thus
+       ;; no reason to restart wallet.
+       (and logged-in? initialized?)
+       [(mailserver/process-next-messages-request)
+        (bottom-sheet/hide-bottom-sheet-old)
+        #(add-new-contact/set-new-identity-reconnected %)]
+
+       logged-in?
+       [(mailserver/process-next-messages-request)
+        (bottom-sheet/hide-bottom-sheet-old)]))))
 
 (defn apply-settings
   ([sync?] (apply-settings sync? :default))

src/legacy/status_im/multiaccounts/logout/core.cljs

@@ -13,14 +13,15 @@
    (native-module/logout)))
 
 (rf/defn initialize-app-db
-  [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type]}
+  [{{:keys           [keycard initials-avatar-font-file]
+     :biometric/keys [supported-type]
+     :network/keys   [type]}
     :db}]
   {:db (assoc db/app-db
               :network/type              type
               :initials-avatar-font-file initials-avatar-font-file
               :keycard                   (dissoc keycard :secrets :pin :application-info)
-              :biometrics                biometrics
+              :biometric/supported-type  supported-type
               :syncing                   nil)})
 
 (rf/defn logout-method
@@ -45,7 +46,6 @@
   [_]
   ;; we need to disable notifications before starting the logout process
   {:effects/push-notifications-disable nil
-   :dispatch                           [:alert-banners/remove-all]
    :dispatch-later                     [{:ms       100
                                          :dispatch [::logout-method
                                                     {:auth-method keychain/auth-method-none

src/legacy/status_im/network/core.cljs

@@ -1,6 +1,11 @@
 (ns legacy.status-im.network.core
   (:require
-    [clojure.string :as string]))
+    [clojure.string :as string]
+    [re-frame.core :as re-frame]
+    [status-im.navigation.events :as navigation]
+    [utils.ethereum.chain :as chain]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
 
 (def url-regex
   #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -9,6 +14,12 @@
   [url]
   (boolean (re-matches url-regex (str url))))
 
+(def default-manage
+  {:name   {:value ""}
+   :url    {:value ""}
+   :symbol {:value ""}
+   :chain  {:value :mainnet}})
+
 (defn validate-string
   [{:keys [value]}]
   {:value value
@@ -45,3 +56,123 @@
   [current-networks network]
   (let [chain-id (get-in network [:config :NetworkId])]
     (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
+
+(defn get-network
+  [{:keys [db]} network-id]
+  (get-in db [:networks/networks network-id]))
+
+(rf/defn set-input
+  {:events [::input-changed]}
+  [{:keys [db]} input-key value]
+  {:db (-> db
+           (update-in [:networks/manage input-key] assoc :value value)
+           (update-in [:networks/manage] validate-manage))})
+
+;; No edit functionality actually implemented
+(rf/defn edit
+  {:events [::add-network-pressed]}
+  [{db :db}]
+  {:db       (assoc db :networks/manage (validate-manage default-manage))
+   :dispatch [:navigate-to :edit-network]})
+
+(rf/defn connect-success
+  {:events [::connect-success]}
+  [_ network-id]
+  {:ui/show-confirmation
+   {:title               (i18n/label :t/close-app-title)
+    :content             (i18n/label :t/logout-app-content)
+    :confirm-button-text (i18n/label :t/close-app-button)
+    :on-accept           #(re-frame/dispatch [::save-network-settings-pressed network-id])
+    :on-cancel           nil}})
+
+(rf/defn connect-failure
+  {:events [::connect-failure]}
+  [_ reason]
+  {:effects.utils/show-popup
+   {:title   (i18n/label :t/error)
+    :content (str reason)}})
+
+(rf/defn connect
+  {:events [::connect-network-pressed]}
+  [{:keys [db] :as cofx} network-id]
+  (if (get-in db [:networks/networks network-id :config])
+    (connect-success cofx network-id)
+    (connect-failure cofx "A network with the specified id doesn't exist")))
+
+(rf/defn delete
+  {:events [::delete-network-pressed]}
+  [{:keys [db]} network]
+  (let [current-network? (= (:networks/current-network db) network)]
+    (if (or current-network?
+            (not (get-in db [:networks/networks network])))
+      {:ui/show-error (i18n/label :t/delete-network-error)}
+      {:ui/show-confirmation {:title               (i18n/label :t/delete-network-title)
+                              :content             (i18n/label :t/delete-network-confirmation)
+                              :confirm-button-text (i18n/label :t/delete)
+                              :on-accept           #(re-frame/dispatch [::remove-network-confirmed
+                                                                        network])
+                              :on-cancel           nil}})))
+
+(rf/defn save-network-settings
+  {:events [::save-network-settings-pressed]}
+  [{:keys [db] :as cofx} network]
+  {:db            (assoc db :networks/current-network network)
+   :json-rpc/call [{:method     "settings_saveSetting"
+                    :params     [:networks/current-network network]
+                    :on-success #(re-frame/dispatch [:logout])}]})
+
+(rf/defn remove-network
+  {:events [::remove-network-confirmed]}
+  [{:keys [db] :as cofx} network]
+  (let [networks (dissoc (:networks/networks db) network)]
+    {:db            (assoc db :networks/networks networks)
+     :json-rpc/call [{:method     "settings_saveSetting"
+                      :params     [:networks/networks (vals networks)]
+                      :on-success #(re-frame/dispatch [:navigate-back])}]}))
+
+(defn new-network
+  [random-id network-name sym upstream-url chain-type chain-id]
+  (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
+        config   {:NetworkId      (or (when chain-id (int chain-id))
+                                      (chain/chain-keyword->chain-id chain-type))
+                  :DataDir        data-dir
+                  :UpstreamConfig {:Enabled true
+                                   :URL     upstream-url}}]
+    {:id     random-id
+     :name   network-name
+     :symbol sym
+     :config config}))
+
+(rf/defn save
+  {:events       [::save-network-pressed]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{{:networks/keys [manage networks] :as db} :db
+    random-id-generator                       :random-id-generator
+    :as                                       cofx}]
+  (if (valid-manage? manage)
+    ;; rename network-id from UI to chain-id
+    (let [{:keys [name url chain network-id symbol]} manage
+          random-id                                  (string/replace (random-id-generator) "-" "")
+          network                                    (new-network random-id
+                                                                  (:value name)
+                                                                  (:value symbol)
+                                                                  (:value url)
+                                                                  (:value chain)
+                                                                  (:value network-id))
+          custom-chain-type?                         (= :custom (:value chain))
+          new-networks                               (assoc networks random-id network)]
+      (if (or (not custom-chain-type?)
+              (chain-id-available? networks network))
+        {:db            (-> db
+                            (dissoc :networks/manage)
+                            (assoc :networks/networks new-networks))
+         :json-rpc/call [{:method     "settings_saveSetting"
+                          :params     [:networks/networks (vals new-networks)]
+                          :on-success #(re-frame/dispatch [:navigate-back])}]}
+        {:ui/show-error "chain-id already defined"}))
+    {:ui/show-error "invalid network parameters"}))
+
+(rf/defn open-network-details
+  {:events [::network-entry-pressed]}
+  [cofx network]
+  (navigation/navigate-to cofx :network-details {:networks/selected-network network}))

src/legacy/status_im/network/core_test.cljs

@@ -31,6 +31,38 @@
   (testing "an https url not on the default port"
     (is (network.core/valid-rpc-url? "https://valid.something.else:65323"))))
 
+(deftest new-network-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         nil)]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      1
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
+(deftest new-network-id-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         "5777")]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      5777
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
 (deftest valid-manage-test
   (testing "a valid manage"
     (is (network.core/valid-manage? {:url    {:value "http://valid.com"}
@@ -60,3 +92,101 @@
                                           :name   {:value "valid"}
                                           :symbol {:value ""}
                                           :chain  {:value "valid"}})))))
+
+(deftest set-input-test
+  (testing "it updates and validate a field"
+    (is
+     (= {:db {:networks/manage {:url        {:value "http://valid.com"
+                                             :error false}
+                                :name       {:value ""
+                                             :error true}
+                                :symbol     {:value "symbol"
+                                             :error false}
+                                :chain      {:value "mainnet"
+                                             :error false}
+                                :network-id {:value nil
+                                             :error false}}}}
+        (network.core/set-input {:db {:networks/manage {:url    {:value "something"
+                                                                 :error true}
+                                                        :name   {:value ""
+                                                                 :error false}
+                                                        :symbol {:value "symbol"
+                                                                 :error false}
+                                                        :chain  {:value "mainnet"
+                                                                 :error false}}}}
+                                :url
+                                "http://valid.com")))))
+
+(deftest not-save-invalid-url
+  (testing "it does not save a network with an invalid url"
+    (is
+     (:ui/show-error (network.core/save {:random-id-generator (constantly "random")
+                                         :db                  {:networks/manage {:url   {:value "wrong"}
+                                                                                 :chain {:value "1"}
+                                                                                 :name  {:value "empty"}}
+                                                               :profile/profile {}}})))))
+
+(deftest save-valid-network
+  (testing "save a valid network"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random-id")
+               :db                  {:networks/manage   {:url    {:value "http://valid.com"}
+                                                         :chain  {:value :mainnet}
+                                                         :symbol {:value "symbol"}
+                                                         :name   {:value "valid"}}
+                                     :profile/profile   {}
+                                     :networks/networks {"random2"
+                                                         {:id     "random2"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 1
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (testing "and check that it has an id with `-` and the correct mainnet NetworkId"
+        (is (= 1 (get-in fx [:db :networks/networks "randomid" :config :NetworkId])))))))
+
+(deftest not-save-custom-chain-with-non-unique-id
+  (testing "it does not save a custom chain with network-id already defined"
+    (let [result (network.core/save
+                  {:random-id-generator (constantly "already-defined")
+                   :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                             :chain      {:value :custom}
+                                                             :name       {:value "valid"}
+                                                             :network-id {:value 1}}
+                                         :profile/profile   {}
+                                         :networks/networks {"random"
+                                                             {:id     "random"
+                                                              :name   "network-name"
+                                                              :config {:NetworkId 1
+                                                                       :DataDir "/ethereum/mainnet_rpc"
+                                                                       :UpstreamConfig
+                                                                       {:Enabled true
+                                                                        :URL     "upstream-url"}}}}}})]
+      (is (:ui/show-error result)))))
+
+(deftest save-valid-network-with-unique-chain-id-check
+  (testing "save a valid network with chain-id not already defined"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random")
+               :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                         :chain      {:value :mainnet}
+                                                         :name       {:value "valid"}
+                                                         :symbol     {:value "symbol"}
+                                                         :network-id {:value 5}}
+                                     :profile/profile   {}
+                                     :networks/networks {"randomid"
+                                                         {:id     "randomid"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 3
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (is (get-in fx [:db :networks/networks "random"])))))

src/legacy/status_im/network/net_info.cljs

@@ -1,6 +1,7 @@
 (ns legacy.status-im.network.net-info
   (:require
     ["@react-native-community/netinfo" :default net-info]
+    [legacy.status-im.mobile-sync-settings.core :as mobile-network]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [taoensso.timbre :as log]
@@ -12,11 +13,11 @@
             {:db (assoc db :network-status (if is-connected? :online :offline))}))
 
 (rf/defn change-network-type
-  [{:keys [db] :as cofx} network-type expensive?]
+  [{:keys [db] :as cofx} old-network-type network-type expensive?]
   (rf/merge cofx
             {:db                       (assoc db :network/type network-type)
-             :network/notify-status-go [network-type expensive?]
-             :dispatch                 [:mobile-network/on-network-status-change]}))
+             :network/notify-status-go [network-type expensive?]}
+            (mobile-network/on-network-status-change)))
 
 (rf/defn handle-network-info-change
   {:events [::network-info-changed]}
@@ -36,7 +37,7 @@
               (when-not status-changed?
                 (change-network-status isConnected))
               (when-not type-changed?
-                (change-network-type type (:is-connection-expensive details))))))
+                (change-network-type old-network-type type (:is-connection-expensive details))))))
 
 (defn add-net-info-listener
   []

src/legacy/status_im/stickers/core.cljs

@@ -2,7 +2,6 @@
   (:require
     [legacy.status-im.utils.utils :as utils]
     [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.constants :as constants]
     [utils.ethereum.chain :as chain]
     [utils.re-frame :as rf]))
@@ -23,21 +22,6 @@
                      :params     [(chain/chain-id db) id]
                      :on-success #()}]}))
 
-(re-frame/reg-fx :stickers/load-packs
- (fn [chain-id]
-   (json-rpc/call {:method     "stickers_market"
-                   :params     [chain-id]
-                   :on-success [:stickers/stickers-market-success]})
-   (json-rpc/call {:method     "stickers_installed"
-                   :params     []
-                   :on-success [:stickers/stickers-installed-success]})
-   (json-rpc/call {:method     "stickers_pending"
-                   :params     []
-                   :on-success [:stickers/stickers-pending-success]})
-   (json-rpc/call {:method     "stickers_recent"
-                   :params     []
-                   :on-success [:stickers/stickers-recent-success]})))
-
 (rf/defn load-packs
   {:events [:stickers/load-packs]}
   [{:keys [db]}]

src/legacy/status_im/subs/mailservers.cljs

@@ -61,7 +61,7 @@
 (re-frame/reg-sub
  :mailserver/use-status-nodes?
  (fn [db _]
-   (boolean (mailserver/fetch-use-mailservers? db))))
+   (boolean (mailserver/fetch-use-mailservers? {:db db}))))
 
 (re-frame/reg-sub
  :mailserver.edit/validation-errors

src/legacy/status_im/subs/networks.cljs

@@ -0,0 +1,39 @@
+(ns legacy.status-im.subs.networks
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))
+
+(defn- filter-networks
+  [network-type]
+  (fn [network]
+    (let [chain-id (chain/network->chain-id network)
+          testnet? (chain/testnet? chain-id)
+          custom?  (:custom? network)]
+      (case network-type
+        :custom  custom?
+        :mainnet (and (not custom?) (not testnet?))
+        :testnet (and (not custom?) testnet?)))))
+
+(defn- label-networks
+  [default-networks]
+  (fn [network]
+    (let [custom? (not (default-networks (:id network)))]
+      (assoc network :custom? custom?))))
+
+(re-frame/reg-sub
+ :get-networks
+ :<- [:networks/networks]
+ (fn [networks]
+   (let [networks (map (label-networks (into #{} (map :id config/default-networks)))
+                       (sort-by :name (vals networks)))
+         types    [:mainnet :testnet :custom]]
+     (zipmap
+      types
+      (map #(filter (filter-networks %) networks) types)))))
+
+(re-frame/reg-sub
+ :manage-network-valid?
+ :<- [:networks/manage]
+ (fn [manage]
+   (not-any? :error (vals manage))))

src/legacy/status_im/subs/root.cljs

@@ -5,6 +5,7 @@
     legacy.status-im.subs.ens
     legacy.status-im.subs.keycard
     legacy.status-im.subs.mailservers
+    legacy.status-im.subs.networks
     legacy.status-im.subs.stickers
     [re-frame.core :as re-frame]))
 
@@ -22,7 +23,6 @@
 (reg-root-key-sub :peers-count :peers-count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
-(reg-root-key-sub :alert-banners :alert-banners)
 
 ;;keycard
 (reg-root-key-sub :keycard :keycard)
@@ -100,7 +100,6 @@
 ;;; Link previews
 (reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 (reg-root-key-sub :chat/link-previews :chat/link-previews)
-(reg-root-key-sub :chat/status-link-previews :chat/status-link-previews)
 
 ;;commands
 (reg-root-key-sub :commands/select-account :commands/select-account)

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

@@ -13,21 +13,37 @@
   (re-frame/dispatch event))
 
 (defn- normal-mode-settings-data
-  [{:keys [current-log-level
+  [{:keys [network-name
+           current-log-level
            light-client-enabled?
            transactions-management-enabled?
            current-fleet
            webview-debug
            test-networks-enabled?
-           is-goerli-enabled?
-           peer-syncing-enabled?]}]
+           is-goerli-enabled?]}]
   (keep
    identity
    [{:size :small
+     :title (i18n/label :t/network)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:navigate-to :network-settings])
+     :accessory :text
+     :accessory-text network-name
+     :chevron true}
+    {:size :small
+     :title (i18n/label :t/network-info)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:navigate-to :network-info])
+     :chevron true}
+    {:size :small
      :title (i18n/label :t/log-level)
      :accessibility-label :log-level-settings-button
      :on-press
-     #(re-frame/dispatch [:open-modal :log-level-settings])
+     #(re-frame/dispatch [:navigate-to :log-level-settings])
      :accessory :text
      :accessory-text current-log-level
      :chevron true}
@@ -35,7 +51,7 @@
      :title (i18n/label :t/fleet)
      :accessibility-label :fleet-settings-button
      :on-press
-     #(re-frame/dispatch [:open-modal :fleet-settings])
+     #(re-frame/dispatch [:navigate-to :fleet-settings])
      :accessory :text
      :accessory-text current-fleet
      :chevron true}
@@ -50,14 +66,14 @@
      :accessibility-label :rpc-usage-info
      :container-margin-top 8
      :on-press
-     #(re-frame/dispatch [:open-modal :rpc-usage-info])
+     #(re-frame/dispatch [:navigate-to :rpc-usage-info])
      :chevron true}
     {:size :small
      :title (i18n/label :t/peers-stats)
      :accessibility-label :peers-stats
      :container-margin-top 8
      :on-press
-     #(re-frame/dispatch [:open-modal :peers-stats])
+     #(re-frame/dispatch [:navigate-to :peers-stats])
      :chevron true}
     {:size :small
      :title (i18n/label :t/light-client-enabled)
@@ -103,19 +119,11 @@
      #(re-frame/dispatch [:profile.settings/toggle-goerli-test-network])
      :accessory :switch
      :active is-goerli-enabled?}
-    {:size :small
-     :title "Peer syncing"
-     :accessibility-label :peer-syncing
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-peer-syncing])
-     :accessory :switch
-     :active peer-syncing-enabled?}
     {:size                :small
      :title               (i18n/label :t/set-currency)
      :accessibility-label :wallet-change-currency
      :on-press            #(hide-sheet-and-dispatch
-                            [:open-modal :currency-settings])
+                            [:navigate-to :currency-settings])
      :chevron             true}]))
 
 (defn- flat-list-data
@@ -134,20 +142,20 @@
                   is-goerli-enabled?               [:profile/is-goerli-enabled?]
                   light-client-enabled?            [:profile/light-client-enabled?]
                   webview-debug                    [:profile/webview-debug]
+                  network-name                     [:network-name]
                   transactions-management-enabled? [:wallet-legacy/transactions-management-enabled?]
                   current-log-level                [:log-level/current-log-level]
-                  current-fleet                    [:fleets/current-fleet]
-                  peer-syncing-enabled?            [:profile/peer-syncing-enabled?]]
+                  current-fleet                    [:fleets/current-fleet]]
     [list/flat-list
      {:data      (flat-list-data
-                  {:current-log-level                current-log-level
+                  {:network-name                     network-name
+                   :current-log-level                current-log-level
                    :transactions-management-enabled? transactions-management-enabled?
                    :light-client-enabled?            light-client-enabled?
                    :current-fleet                    current-fleet
                    :dev-mode?                        false
                    :webview-debug                    webview-debug
                    :test-networks-enabled?           test-networks-enabled?
-                   :is-goerli-enabled?               is-goerli-enabled?
-                   :peer-syncing-enabled?            peer-syncing-enabled?})
+                   :is-goerli-enabled?               is-goerli-enabled?})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]))

src/legacy/status_im/ui/screens/communities/invite.cljs

@@ -85,7 +85,9 @@
              :accessibility-label :share-community-link
              :type                :secondary
              :on-press            #(debounce/throttle-and-dispatch
-                                    [::communities/share-community-confirmation-pressed @user-pk
+                                    [(if can-invite?
+                                       ::communities/invite-people-confirmation-pressed
+                                       ::communities/share-community-confirmation-pressed) @user-pk
                                      selected]
                                     3000)}
             (i18n/label (if can-invite? :t/invite :t/share))]}]]))))

src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs

@@ -21,7 +21,7 @@
    {:active    (= value id)
     :accessory :radio
     :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/profile-update :default-sync-period id])}])
+    :on-press  #(re-frame/dispatch [:profile.settings/update-value :default-sync-period id])}])
 
 (views/defview default-sync-period-settings
   []

src/legacy/status_im/ui/screens/network/edit_network/styles.cljs

@@ -0,0 +1,12 @@
+(ns legacy.status-im.ui.screens.network.edit-network.styles)
+
+(def edit-network-view
+  {:flex              1
+   :margin-horizontal 16
+   :margin-vertical   15})
+
+(def bottom-container
+  {:flex-direction   :row
+   :padding-vertical 4})
+
+(def container {:flex 1})

src/legacy/status_im/ui/screens/network/edit_network/views.cljs

@@ -0,0 +1,72 @@
+(ns legacy.status-im.ui.screens.network.edit-network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.edit-network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- render-network-type
+  [type _ _ manage-network]
+  (let [name (case type
+               :mainnet (i18n/label :t/mainnet-network)
+               :goerli  (i18n/label :t/goerli-network)
+               :custom  (i18n/label :t/custom))]
+    [list.item/list-item
+     {:title     name
+      :accessory :radio
+      :active    (= (get-in manage-network [:chain :value]) type)
+      :on-press  #(re-frame/dispatch [::network/input-changed :chain type])}]))
+
+(views/defview edit-network
+  []
+  (views/letsubs [manage-network [:networks/manage]
+                  is-valid?      [:manage-network-valid?]]
+    (let [custom? (= (get-in manage-network [:chain :value]) :custom)]
+      [react/keyboard-avoiding-view {:flex 1}
+       [react/scroll-view
+        [react/view styles/edit-network-view
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/name)
+            :placeholder    (i18n/label :t/specify-name)
+            :default-value  (get-in manage-network [:name :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :name %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/symbol)
+            :placeholder    (i18n/label :t/specify-symbol)
+            :default-value  (get-in manage-network [:symbol :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :symbol %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/rpc-url)
+            :placeholder    (i18n/label :t/specify-rpc-url)
+            :default-value  (get-in manage-network [:url :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :url %])}]]]
+        [quo/list-header (i18n/label :t/network-chain)]
+        [list/flat-list
+         {:data        [:mainnet :goerli :custom]
+          :key-fn      (fn [_ i] (str i))
+          :render-data manage-network
+          :render-fn   render-network-type}]
+        (when custom?
+          [react/view styles/edit-network-view
+           [quo/text-input
+            {:label          (i18n/label :t/network-id)
+             :placeholder    (i18n/label :t/specify-network-id)
+             :on-change-text #(re-frame/dispatch [::network/input-changed :network-id %])}]])]
+       [react/view styles/bottom-container
+        [react/view {:flex 1}]
+        [quo/button
+         {:after    :main-icons/next
+          :type     :secondary
+          :disabled (not is-valid?)
+          :on-press #(re-frame/dispatch [::network/save-network-pressed])}
+         (i18n/label :t/save)]]])))

src/legacy/status_im/ui/screens/network/network_details/views.cljs

@@ -0,0 +1,47 @@
+(ns legacy.status-im.ui.screens.network.network-details.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.styles :as st]
+    [legacy.status-im.ui.screens.network.views :as network-settings]
+    [re-frame.core :as re-frame]
+    [utils.debounce :refer [throttle-and-dispatch]]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(views/defview network-details
+  []
+  (views/letsubs [{:keys [networks/selected-network]} [:get-screen-params]
+                  current-network                     [:networks/current-network]
+                  networks                            [:get-networks]]
+    (let [{:keys [id name config]} selected-network
+          connected?               (= id current-network)
+          custom?                  (seq (filter #(= (:id %) id) (:custom networks)))]
+      [:<>
+       [react/view {:flex 1}
+        [network-settings/network-badge
+         {:name       name
+          :connected? connected?}]
+        (when-not connected?
+          [react/touchable-highlight
+           {:on-press #(throttle-and-dispatch [::network/connect-network-pressed id] 1000)}
+           [react/view st/connect-button-container
+            [react/view
+             {:style               st/connect-button
+              :accessibility-label :network-connect-button}
+             [react/text {:style st/connect-button-label}
+              (i18n/label :t/connect)]]
+            [react/i18n-text
+             {:style st/connect-button-description
+              :key   :connecting-requires-login}]]])
+        [react/view (st/network-config-container)
+         [react/text
+          {:style               st/network-config-text
+           :accessibility-label :network-details-text}
+          config]]]
+       (when custom?
+         [react/view st/bottom-container
+          [react/view {:flex 1}
+           [quo/button {:on-press #(re-frame/dispatch [::network/delete-network-pressed id])}
+            (i18n/label :t/delete)]]])])))

src/legacy/status_im/ui/screens/network/styles.cljs

@@ -0,0 +1,90 @@
+(ns legacy.status-im.ui.screens.network.styles
+  (:require
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.utils.styles :as styles]))
+
+(def wrapper
+  {:flex 1})
+
+(def badge-name-text
+  {:font-size 17})
+
+(styles/def badge-connected-text
+  {:color colors/gray
+   :ios   {:margin-top 5}})
+
+(def connect-button-container
+  {:margin-top        8
+   :margin-bottom     16
+   :margin-horizontal 16})
+
+(def connect-button
+  {:height           52
+   :align-items      :center
+   :justify-content  :center
+   :background-color colors/blue
+   :border-radius    8
+   :ios              {:opacity 0.9}})
+
+(def connect-button-label
+  {:color     colors/white-persist
+   :font-size 17})
+
+(def connect-button-description
+  {:color      colors/gray
+   :margin-top 8
+   :height     20})
+
+(styles/defn network-config-container
+  []
+  {:height            160
+   :margin-top        8
+   :padding-top       16
+   :padding-left      16
+   :margin-horizontal 16
+   :background-color  colors/gray-lighter
+   :ios               {:border-radius 9
+                       :opacity       0.9}
+   :android           {:border-radius 4}})
+
+(styles/def network-config-text
+  {:font-size 17
+   :ios       {:opacity 0.8}
+   :android   {:opacity 0.4}})
+
+(defn network-icon
+  [connected? size]
+  {:width            size
+   :height           size
+   :border-radius    (/ size 2)
+   :background-color (if connected? colors/blue colors/gray-lighter)
+   :align-items      :center
+   :justify-content  :center})
+
+(def network-badge
+  {:height         88
+   :padding-left   16
+   :flex-direction :row
+   :align-items    :center})
+
+(styles/def network-item
+  {:flex-direction     :row
+   :align-items        :center
+   :padding-horizontal 16
+   :ios                {:height 64}
+   :android            {:height 56}})
+
+(def network-item-name-text
+  {:font-size 17})
+
+(def network-item-connected-text
+  {:color      colors/gray
+   :font-size  14
+   :margin-top 6})
+
+(def bottom-container
+  {:flex-direction    :row
+   :margin-horizontal 12
+   :margin-vertical   15})
+
+(def container {:flex 1})

src/legacy/status_im/ui/screens/network/views.cljs

@@ -0,0 +1,71 @@
+(ns legacy.status-im.ui.screens.network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.components.topbar :as topbar]
+    [legacy.status-im.ui.screens.network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- network-icon
+  [connected? size]
+  [react/view (styles/network-icon connected? size)
+   [icons/icon :main-icons/network {:color (if connected? colors/white-persist colors/gray)}]])
+
+(defn network-badge
+  [& [{:keys [name connected?]}]]
+  [react/view styles/network-badge
+   [network-icon connected? 56]
+   [react/view {:padding-left 16}
+    [react/text {:style styles/badge-name-text}
+     (or name (i18n/label :t/new-network))]
+    (when connected?
+      [react/i18n-text
+       {:style styles/badge-connected-text
+        :key   :connected}])]])
+
+(def mainnet?
+  #{"mainnet" "mainnet_rpc"})
+
+(defn render-network
+  [{:keys [id name] :as network} _ _ current-network]
+  (let [connected? (= id current-network)]
+    [list.item/list-item
+     {:on-press      #(re-frame/dispatch [::network/network-entry-pressed network])
+      :icon          :main-icons/network
+      :icon-bg-color (if connected? colors/blue colors/gray-lighter)
+      :icon-color    (if connected? colors/white-persist colors/gray)
+      :title         name
+      :subtitle      (when connected? (i18n/label :t/connected))
+      :chevron       true}]))
+
+(views/defview network-settings
+  []
+  (views/letsubs [current-network [:networks/current-network]
+                  networks        [:get-networks]]
+    [:<>
+     [topbar/topbar
+      {:title (i18n/label :t/network-settings)
+       :right-accessories
+       [{:icon     :main-icons/add
+         :on-press #(re-frame/dispatch [::network/add-network-pressed])}]}]
+     [react/view styles/wrapper
+      [list/section-list
+       {:sections           [{:title (i18n/label :t/main-networks)
+                              :key   :mainnet
+                              :data  (:mainnet networks)}
+                             {:title (i18n/label :t/test-networks)
+                              :key   :testnet
+                              :data  (:testnet networks)}
+                             {:title (i18n/label :t/custom-networks)
+                              :key   :custom
+                              :data  (:custom networks)}]
+        :key-fn             :id
+        :default-separator? true
+        :render-data        current-network
+        :render-fn          render-network}]]]))

src/legacy/status_im/ui/screens/network_info/views.cljs

@@ -0,0 +1,84 @@
+(ns legacy.status-im.ui.screens.network-info.views
+  (:require
+    [legacy.status-im.ethereum.decode :as decode]
+    [legacy.status-im.ui.components.react :as react]
+    [native-module.core :as native-module]
+    [re-frame.core :as re-frame]
+    [reagent.core :as reagent]
+    [status-im.common.json-rpc.events :as json-rpc]
+    [utils.datetime :as datetime]))
+
+(defn get-block
+  [block callback]
+  (json-rpc/call
+   {:method     "eth_getBlockByNumber"
+    :params     [block false]
+    :on-success callback
+    :on-error   #(js/alert (str "can't fetch latest block" %))}))
+
+(defn to-date
+  [timestamp]
+  (datetime/timestamp->long-date
+   (* 1000 timestamp)))
+
+(defn check-lag
+  []
+  (let [latest-block (reagent/atom nil)
+        last-loaded-block (reagent/atom nil)
+        on-press
+        (fn []
+          (get-block
+           "latest"
+           (fn [res]
+             (reset! latest-block res)
+             (get-block
+              (str "0x"
+                   (native-module/number-to-hex
+                    @(re-frame/subscribe [:ethereum/current-block])))
+              (fn [res]
+                (reset! last-loaded-block res))))))]
+    (fn []
+      [react/view
+       {:style {:flex              1
+                :margin-horizontal 16}}
+       (if-not @latest-block
+         [react/text
+          {:on-press on-press}
+          "PRESS TO REFRESH"]
+         [react/text
+          {:on-press on-press}
+          (let [latest-block-number
+                (decode/uint (:number @latest-block))
+
+                latest-block-timestamp
+                (decode/uint (:timestamp @latest-block))
+
+                last-loaded-block-number
+                (decode/uint (:number @last-loaded-block))
+
+                last-loaded-block-timestamp
+                (decode/uint (:timestamp @last-loaded-block))]
+            (str "Latest block number: "
+                 latest-block-number
+                 "\n"
+                 "Latest block time: "
+                 (to-date latest-block-timestamp)
+                 "\n"
+                 "Last loaded block: "
+                 last-loaded-block-number
+                 "\n"
+                 "Last loaded block time: "
+                 (to-date last-loaded-block-timestamp)
+                 "\n"
+                 "Seconds diff: "
+                 (- latest-block-timestamp
+                    last-loaded-block-timestamp)
+                 "\n"
+                 "Blocks diff: " (- latest-block-number
+                                    last-loaded-block-number)
+                 "\n"
+                 "PRESS TO REFRESH"))])])))
+
+(defn network-info
+  []
+  [check-lag])

src/legacy/status_im/ui/screens/privacy_and_security_settings/views.cljs

@@ -111,7 +111,7 @@
          :subtitle           (i18n/label :t/webview-camera-permission-requests-subtitle)
          :subtitle-max-lines 2
          :on-press           #(re-frame/dispatch
-                               [:profile.settings/profile-update
+                               [:profile.settings/update-value
                                 :webview-allow-permission-requests?
                                 ((complement boolean) webview-allow-permission-requests?)])}])
      [separator]
@@ -169,7 +169,8 @@
    {:active    (= value id)
     :accessory :radio
     :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/profile-update :profile-pictures-visibility id])}])
+    :on-press  #(re-frame/dispatch [:profile.settings/update-value :profile-pictures-visibility
+                                    id])}])
 
 (views/defview profile-pic
   []

src/legacy/status_im/ui/screens/profile/user/edit_picture.cljs

@@ -51,4 +51,4 @@
          :icon                :main-icons/delete
          :theme               :accent
          :title               (i18n/label :t/profile-pic-remove)
-         :on-press            #(re-frame/dispatch [:profile.settings/delete-profile-picture])}])]))
+         :on-press            #(re-frame/dispatch [:profile.settings/delete-profile-picture nil])}])]))

src/legacy/status_im/ui/screens/profile/user/views.cljs

@@ -102,7 +102,7 @@
                :chevron              true
                :icon                 :main-icons/username}
         registrar
-        (assoc :on-press #(re-frame/dispatch [:open-modal :ens-main registrar])))]
+        (assoc :on-press #(re-frame/dispatch [:navigate-to :ens-main registrar])))]
      [list.item/list-item
       {:title               (i18n/label :t/contacts)
        :icon                :main-icons/in-contacts
@@ -112,7 +112,7 @@
                               (str active-contacts-count)
                               (i18n/label :t/none))
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :contacts-list])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :contacts-list])}]
      [react/view {:padding-top 16}
       [quo/list-header (i18n/label :t/settings)]]
      [list.item/list-item
@@ -122,71 +122,71 @@
        :chevron             true
        :accessory           (when mnemonic
                               [components.common/counter {:size 22} 1])
-       :on-press            #(re-frame/dispatch [:open-modal :privacy-and-security])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :privacy-and-security])}]
      (when config/quo-preview-enabled?
        [list.item/list-item
         {:icon                :main-icons/appearance
          :title               "Quo Preview"
          :accessibility-label :appearance-settings-button
          :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :quo-preview])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :quo-preview])}])
      (when config/quo-preview-enabled?
        [list.item/list-item
         {:icon                :main-icons/appearance
          :title               "Status IM Components"
          :accessibility-label :status-im-common-components
          :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :status-im-preview])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :status-im-preview])}])
      [list.item/list-item
       {:icon                :main-icons/appearance
        :title               (i18n/label :t/appearance)
        :accessibility-label :appearance-settings-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :appearance])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :appearance])}]
      [list.item/list-item
       {:icon                :main-icons/notification
        :title               (i18n/label :t/notifications)
        :accessibility-label :notifications-settings-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :notifications])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :notifications])}]
      [list.item/list-item
       {:icon                :main-icons/mobile
        :title               (i18n/label :t/sync-settings)
        :accessibility-label :sync-settings-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :sync-settings])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :sync-settings])}]
      (when keycard-pairing
        [list.item/list-item
         {:icon                :main-icons/keycard
          :title               (i18n/label :t/keycard)
          :accessibility-label :keycard-button
          :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :keycard-settings])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :keycard-settings])}])
      [list.item/list-item
       {:icon                :main-icons/settings-advanced
        :title               (i18n/label :t/advanced)
        :accessibility-label :advanced-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :advanced-settings])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :advanced-settings])}]
      [list.item/list-item
       {:icon                :main-icons/help
        :title               (i18n/label :t/need-help)
        :accessibility-label :help-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :help-center])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :help-center])}]
      [list.item/list-item
       {:icon                :main-icons/info
        :title               (i18n/label :t/about-app)
        :accessibility-label :about-button
        :chevron             true
-       :on-press            #(re-frame/dispatch [:open-modal :about-app])}]
+       :on-press            #(re-frame/dispatch [:navigate-to :about-app])}]
      (when local-pairing-mode-enabled?
        [list.item/list-item
         {:icon                :i/mobile
          :title               (i18n/label :t/syncing)
          :accessibility-label :syncing
          :chevron             true
-         :on-press            #(re-frame/dispatch [:open-modal :settings-syncing])}])
+         :on-press            #(re-frame/dispatch [:navigate-to :settings-syncing])}])
      [react/view {:padding-vertical 24}
       [list.item/list-item
        {:icon :main-icons/log-out

src/legacy/status_im/ui/screens/screens.cljs

@@ -1,6 +1,7 @@
 (ns legacy.status-im.ui.screens.screens
   (:require
     [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
     [legacy.status-im.ui.screens.about-app.views :as about-app]
     [legacy.status-im.ui.screens.advanced-settings.views :as advanced-settings]
     [legacy.status-im.ui.screens.appearance.views :as appearance]
@@ -23,6 +24,10 @@
     [legacy.status-im.ui.screens.link-previews-settings.views :as link-previews-settings]
     [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
     [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
+    [legacy.status-im.ui.screens.network-info.views :as network-info]
+    [legacy.status-im.ui.screens.network.edit-network.views :as edit-network]
+    [legacy.status-im.ui.screens.network.network-details.views :as network-details]
+    [legacy.status-im.ui.screens.network.views :as network]
     [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
     [legacy.status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
     [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
@@ -47,18 +52,10 @@
     [status-im.contexts.chat.group-details.view :as group-details]
     [utils.i18n :as i18n]))
 
-(defn topbar-options
-  [title]
-  {:elevation        0
-   :title            {:color (if (colors/dark?) colors/white colors/black)
-                      :text  (i18n/label title)}
-   :rightButtonColor (if (colors/dark?) colors/white colors/black)
-   :background       {:color (if (colors/dark?) colors/black colors/white)}
-   :backButton       {:color           (if (colors/dark?) colors/white colors/black)
-                      :id              :legacy-back-button
-                      :testID          :back-button
-                      :visible         true
-                      :popStackOnPress false}})
+(defn right-button-options
+  [id icon]
+  {:id   id
+   :icon (icons/icon-source icon)})
 
 (defn screens
   []
@@ -84,7 +81,7 @@
 
    {:name      :stickers
     :options   {:insets {:top? true}
-                :topBar (topbar-options :t/sticker-market)}
+                :topBar {:title {:text (i18n/label :t/sticker-market)}}}
     :component stickers/packs}
 
    {:name      :stickers-pack
@@ -97,7 +94,7 @@
     :component group-chat/new-group}
 
    {:name      :currency-settings
-    :options   {:topBar (topbar-options :t/main-currency)
+    :options   {:topBar {:title {:text (i18n/label :t/main-currency)}}
                 :insets {:top? true}}
     :component currency-settings/currency-settings}
 
@@ -107,27 +104,27 @@
     :options   {:topBar {:visible false}}
     :component profile.user/my-profile}
    {:name      :contacts-list
-    :options   {:topBar (topbar-options :t/contacts)
+    :options   {:topBar {:title {:text (i18n/label :t/contacts)}}
                 :insets {:top? true}}
     :component contacts-list/contacts-list}
    {:name      :ens-main
-    :options   {:topBar (topbar-options :t/ens-usernames)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-usernames)}}
                 :insets {:top? true}}
     :component ens/main}
    {:name      :ens-search
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                 :insets {:top? true}}
     :component ens/search}
    {:name      :ens-checkout
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                 :insets {:top? true}}
     :component ens/checkout}
    {:name      :ens-confirmation
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                 :insets {:top? true}}
     :component ens/confirmation}
    {:name      :ens-terms
-    :options   {:topBar (topbar-options :t/ens-terms-registration)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-terms-registration)}}
                 :insets {:top? true}}
     :component ens/terms}
    {:name      :ens-name-details
@@ -135,7 +132,7 @@
     :options   {:insets {:top? true}}
     :component ens/name-details}
    {:name      :blocked-users-list
-    :options   {:topBar (topbar-options :t/blocked-users)
+    :options   {:topBar {:title {:text (i18n/label :t/blocked-users)}}
                 :insets {:top? true}}
     :component contacts-list/blocked-users-list}
    {:name      :wakuv2-settings
@@ -151,7 +148,7 @@
     :options   {:insets {:top? true}}
     :component bootnodes-settings/bootnodes-settings}
    {:name      :installations
-    :options   {:topBar (topbar-options (i18n/label :t/devices))
+    :options   {:topBar {:title {:text (i18n/label :t/devices)}}
                 :insets {:top? true}}
     :component pairing/installations}
    {:name      :edit-bootnode
@@ -167,91 +164,107 @@
     :options   {:insets {:top? true}}
     :component edit-mailserver/edit-mailserver}
    {:name      :dapps-permissions
-    :options   {:topBar (topbar-options :t/dapps-permissions)
+    :options   {:topBar {:title {:text (i18n/label :t/dapps-permissions)}}
                 :insets {:top? true}}
     :component dapps-permissions/dapps-permissions}
    {:name      :privacy-and-security
-    :options   {:topBar (topbar-options :t/privacy-and-security)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-and-security)}}
                 :insets {:top? true}}
     :component privacy-and-security/privacy-and-security}
    {:name      :messages-from-contacts-only
-    :options   {:topBar (topbar-options :t/accept-new-chats-from)
+    :options   {:topBar {:title {:text (i18n/label :t/accept-new-chats-from)}}
                 :insets {:top? true}}
     :component messages-from-contacts-only/messages-from-contacts-only-view}
    {:name      :appearance
-    :options   {:topBar (topbar-options :t/appearance)
+    :options   {:topBar {:title {:text (i18n/label :t/appearance)}}
                 :insets {:top? true}}
     :component appearance/appearance-view}
    {:name      :privacy-and-security-profile-pic-show-to
-    :options   {:topbar (topbar-options :t/show-profile-pictures-to)
+    :options   {:topbar {:title {:text (i18n/label :t/show-profile-pictures-to)}}
                 :insets {:top? true}}
     :component privacy-and-security/profile-pic-show-to}
    {:name      :privacy-and-security-profile-pic
-    :options   {:topBar (topbar-options :t/show-profile-pictures)
+    :options   {:topBar {:title {:text (i18n/label :t/show-profile-pictures)}}
                 :insets {:top? true}}
     :component privacy-and-security/profile-pic}
    {:name      :notifications
-    :options   {:topBar (topbar-options :t/notification-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/notification-settings)}}
                 :insets {:top? true}}
     :component notifications-settings/notifications-settings}
    {:name      :sync-settings
-    :options   {:topBar (topbar-options :t/sync-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/sync-settings)}}
                 :insets {:top? true}}
     :component sync-settings/sync-settings}
    {:name      :advanced-settings
-    :options   {:topBar (topbar-options :t/advanced)
+    :options   {:topBar {:title {:text (i18n/label :t/advanced)}}
                 :insets {:top? true}}
     :component advanced-settings/advanced-settings}
    {:name      :help-center
-    :options   {:topBar (topbar-options :t/need-help)
+    :options   {:topBar {:title {:text (i18n/label :t/need-help)}}
                 :insets {:top? true}}
     :component help-center/help-center}
    {:name      :glossary
-    :options   {:topBar (topbar-options :t/glossary)
+    :options   {:topBar {:title {:text (i18n/label :t/glossary)}}
                 :insets {:top? true}}
     :component glossary/glossary}
    {:name      :about-app
-    :options   {:topBar (topbar-options :t/about-app)
+    :options   {:topBar {:title {:text (i18n/label :t/about-app)}}
                 :insets {:top? true}}
     :component about-app/about-app}
    {:name      :privacy-policy
-    :options   {:topBar (topbar-options :t/privacy-policy)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-policy)}}
                 :insets {:top? true}}
     :component about-app/privacy-policy}
    {:name      :terms-of-service
-    :options   {:topBar (topbar-options :t/terms-of-service)
+    :options   {:topBar {:title {:text (i18n/label :t/terms-of-service)}}
                 :insets {:top? true}}
     :component about-app/tos}
    {:name      :principles
-    :options   {:topBar (topbar-options :t/principles)
+    :options   {:topBar {:title {:text (i18n/label :t/principles)}}
                 :insets {:top? true}}
     :component about-app/principles}
    {:name      :manage-dapps-permissions
     ;;TODO dynamic title
     :options   {:insets {:top? true}}
     :component dapps-permissions/manage}
+   {:name      :network-settings
+    ;;TODO accessories
+    :options   {:insets {:top? true}}
+    :component network/network-settings}
+   {:name      :network-details
+    :options   {:topBar {:title {:text (i18n/label :t/network-details)}}
+                :insets {:top? true}}
+    :component network-details/network-details}
+   {:name      :network-info
+    :options   {:topBar {:title {:text (i18n/label :t/network-info)}}
+                :insets {:top? true}}
+    :component network-info/network-info}
    {:name      :rpc-usage-info
-    :options   {:topBar (topbar-options :t/rpc-usage-info)
+    :options   {:topBar {:title {:text (i18n/label :t/rpc-usage-info)}}
                 :insets {:top? true}}
     :component rpc-usage-info/usage-info}
    {:name      :peers-stats
-    :options   {:topBar (topbar-options :t/peers-stats)
+    :options   {:topBar {:title {:text (i18n/label :t/peers-stats)}}
                 :insets {:top? true}}
     :component peers-stats/peers-stats}
+   {:name      :edit-network
+    :options   {:topBar {:title {:text (i18n/label :t/add-network)}}
+                :insets {:top? true}}
+    :component edit-network/edit-network}
    {:name      :log-level-settings
-    :options   {:topBar (topbar-options :t/log-level-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/log-level-settings)}}
                 :insets {:top? true}}
     :component log-level-settings/log-level-settings}
    {:name      :fleet-settings
-    :options   {:topBar (topbar-options :t/fleet-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/fleet-settings)}}
                 :insets {:top? true}}
     :component fleet-settings/fleet-settings}
    {:name      :mobile-network-settings
-    :options   {:topBar (topbar-options :t/mobile-network-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/mobile-network-settings)}}
                 :insets {:top? true}}
     :component mobile-network-settings/mobile-network-settings}
    {:name      :backup-settings
-    :options   {:topBar (topbar-options :t/backup-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/backup-settings)}}
                 :insets {:top? true}}
     :component backup-settings/backup-settings}
    {:name      :backup-seed
@@ -259,14 +272,14 @@
     :options   {:insets {:top? true}}
     :component profile.seed/backup-seed}
    {:name      :reset-password
-    :options   {:topBar (topbar-options :t/reset-password)
+    :options   {:topBar {:title {:text (i18n/label :t/reset-password)}}
                 :insets {:top? true}}
     :component reset-password/reset-password}
    {:name      :delete-profile
     :insets    {:bottom? true}
     :component delete-profile/delete-profile}
    {:name      :default-sync-period-settings
-    :options   {:topBar (topbar-options :t/default-sync-period)
+    :options   {:topBar {:title {:text (i18n/label :t/default-sync-period)}}
                 :insets {:top? true}}
     :component default-sync-period-settings/default-sync-period-settings}
 
@@ -275,7 +288,7 @@
    ;[Chat] Link preview settings
 
    {:name      :link-previews-settings
-    :options   {:topBar (topbar-options :t/chat-link-previews)
+    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
                 :insets {:top? true}}
     :component link-previews-settings/link-previews-settings}
 
@@ -315,7 +328,7 @@
    ;;TODO WHY MODAL?
    ;[Profile] Notifications settings
    {:name      :notifications-settings
-    :options   {:topBar             (topbar-options :t/notification-settings)
+    :options   {:topBar             {:title {:text (i18n/label :t/notification-settings)}}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}

src/legacy/status_im/utils/logging/core.cljs

@@ -10,7 +10,6 @@
     [re-frame.core :as re-frame]
     [react-native.mail :as react-native-mail]
     [react-native.platform :as platform]
-    [status-im.common.json-rpc.events :as json-rpc]
     [status-im.common.log :as log]
     [status-im.config :as config]
     [utils.datetime :as datetime]
@@ -32,10 +31,11 @@
   [{:keys [db]} node-version]
   {:db (assoc db :web3-node-version node-version)})
 
-(re-frame/reg-fx :logging/initialize-web3-client-version
- (fn []
-   (json-rpc/call {:method     "web3_clientVersion"
-                   :on-success [:logging/store-web3-client-version]})))
+(rf/defn initialize-web3-client-version
+  {:events [:logging/initialize-web3-client-version]}
+  [_]
+  {:json-rpc/call [{:method     "web3_clientVersion"
+                    :on-success #(re-frame/dispatch [:logging/store-web3-client-version %])}]})
 
 (defn extract-url-components
   [address]

src/legacy/status_im/utils/mobile_sync.cljs

@@ -5,7 +5,7 @@
   (= network-type "cellular"))
 
 (defn syncing-allowed?
-  [db]
+  [{:keys [db]}]
   (let [network                              (:network/type db)
         {:keys [syncing-on-mobile-network?]} (:profile/profile db)]
     (or (= network "wifi")

src/mocks/js_dependencies.cljs

@@ -2,7 +2,7 @@
   (:require-macros [legacy.status-im.utils.slurp :refer [slurp]])
   (:require
     [legacy.status-im.fleet.default-fleet :refer (default-fleets)])
-  (:require [tests.test-utils :as utils.test]))
+  (:require [legacy.status-im.utils.test :as utils.test]))
 
 ;; to generate a js Proxy at js/__STATUS_MOBILE_JS_IDENTITY_PROXY__ that accept any (.xxx) call and
 ;; return itself

src/native_module/core.cljs

@@ -258,6 +258,11 @@
   (log/debug "[native-module]  set-soft-input-mode")
   (.setSoftInputMode ^js (ui-helper) mode))
 
+(defn request-local-network-access
+  [callback]
+  (log/debug "[native-module] request-local-network-access")
+  (.requestLocalNetworkAccess ^js (network) callback))
+
 (defn call-rpc
   [payload callback]
   (log/debug "[native-module] call-rpc")

src/quo/README.md

@@ -106,32 +106,6 @@ The convention is `:size-<number>`, e.g size `20` is `:size-20`
 - Try to make all other vars private because they should almost never be used
   directly.
 
-## Default value when destructuring
-
-Too often callers pass nil values because values can be wrapped in a `when` for example.
-In this case, the default value is not applied, because :or macro will use default only when the value is absent.
-Instead, use `(or (:value props) some-default-value)` in a `let` expression or as a parameter value.
-
-```clojure
-;; bad (unreliable)
-(defn- view-internal
-  [{:keys [auto-focus?
-           init-value
-           return-key-type]
-    :or   {auto-focus?     false
-           init-value      0
-           return-key-type :done}}]
-  ...)
-
-;; good
-(defn- view-internal
-   [{:keys [theme size something] :as props}]
-   (let [auto-focus? (or (:auto-focus? props) false)
-         init-value (or (:init-value props) 0)
-         return-key-type (or (:return-key-type props) :done)]
-     ...))
-```
-
 ## Component tests
 
 We don't attempt to write component tests verifying how components look on the

src/quo/components/avatars/collection_avatar/style.cljs

@@ -2,17 +2,10 @@
   (:require
     [quo.foundations.colors :as colors]))
 
-(defn- get-dimensions
-  [size]
-  (case size
-    :size-24 24
-    :size-20 20
-    nil))
-
 (defn collection-avatar
-  [theme size]
-  {:width         (get-dimensions size)
-   :height        (get-dimensions size)
+  [theme]
+  {:width         24
+   :height        24
    :border-width  1
    :border-color  (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
    :border-radius 6})

src/quo/components/avatars/collection_avatar/view.cljs

@@ -9,10 +9,10 @@
    
     :image - collection image
     :theme - keyword -> :light/:dark"
-  [{:keys [image theme size] :or {size :size-24}}]
+  [{:keys [image theme]}]
   [fast-image/fast-image
    {:accessibility-label :collection-avatar
     :source              image
-    :style               (style/collection-avatar theme size)}])
+    :style               (style/collection-avatar theme)}])
 
 (def view (quo.theme/with-theme view-internal))

src/quo/components/buttons/slide_button/view.cljs

@@ -14,26 +14,28 @@
     [react-native.reanimated :as reanimated]))
 
 (defn drag-gesture
-  [x-pos disabled? track-width sliding-complete?
+  [x-pos gestures-disabled? set-gestures-disabled disabled? track-width sliding-complete?
    set-sliding-complete
    on-complete reset-fn]
-  (-> (gesture/gesture-pan)
-      (gesture/with-test-ID :slide-button-gestures)
-      (gesture/enabled (not disabled?))
-      (gesture/min-distance 0)
-      (gesture/on-update (fn [event]
-                           (let [x-translation (oops/oget event "translationX")
-                                 clamped-x     (utils/clamp-value x-translation 0 track-width)
-                                 reached-end?  (>= clamped-x track-width)]
-                             (reanimated/set-shared-value x-pos clamped-x)
-                             (when (and reached-end? (not sliding-complete?))
-                               (set-sliding-complete true)
-                               (when on-complete (on-complete reset-fn))))))
-      (gesture/on-end (fn [event]
-                        (let [x-translation (oops/oget event "translationX")
-                              reached-end?  (>= x-translation track-width)]
-                          (when (not reached-end?)
-                            (animations/reset-track-position x-pos)))))))
+  (let [gestures-enabled? (not (or disabled? gestures-disabled?))]
+    (-> (gesture/gesture-pan)
+        (gesture/with-test-ID :slide-button-gestures)
+        (gesture/enabled gestures-enabled?)
+        (gesture/min-distance 0)
+        (gesture/on-update (fn [event]
+                             (let [x-translation (oops/oget event "translationX")
+                                   clamped-x     (utils/clamp-value x-translation 0 track-width)
+                                   reached-end?  (>= clamped-x track-width)]
+                               (reanimated/set-shared-value x-pos clamped-x)
+                               (when (and reached-end? (not sliding-complete?))
+                                 (set-gestures-disabled true)
+                                 (set-sliding-complete true)
+                                 (when on-complete (on-complete reset-fn))))))
+        (gesture/on-end (fn [event]
+                          (let [x-translation (oops/oget event "translationX")
+                                reached-end?  (>= x-translation track-width)]
+                            (when (not reached-end?)
+                              (animations/reset-track-position x-pos))))))))
 
 (defn view
   "Options
@@ -53,11 +55,14 @@
         [track-width set-track-width] (rn/use-state nil)
         [sliding-complete?
          set-sliding-complete]        (rn/use-state false)
+        [gestures-disabled?
+         set-gestures-disabled]       (rn/use-state disabled?)
         on-track-layout               (rn/use-callback
                                        #(set-track-width (oops/oget % "nativeEvent.layout.width")))
         reset-fn                      (rn/use-callback
                                        (fn []
                                          (set-sliding-complete false)
+                                         (set-gestures-disabled false)
                                          (animations/reset-track-position x-pos)))
         dimensions                    (rn/use-callback
                                        (partial utils/get-dimensions
@@ -72,13 +77,15 @@
                                        [dimensions])
         custom-color                  (if (= type :danger) :danger customization-color)
         gesture                       (rn/use-memo #(drag-gesture x-pos
+                                                                  gestures-disabled?
+                                                                  set-gestures-disabled
                                                                   disabled?
                                                                   (dimensions :usable-track)
                                                                   sliding-complete?
                                                                   set-sliding-complete
                                                                   on-complete
                                                                   reset-fn)
-                                                   [sliding-complete? disabled?])]
+                                                   [gestures-disabled? sliding-complete? disabled?])]
     [gesture/gesture-detector
      {:gesture gesture}
      [reanimated/view

src/quo/components/colors/color_picker/component_spec.cljs

@@ -1,6 +1,7 @@
 (ns quo.components.colors.color-picker.component-spec
   (:require
     [quo.components.colors.color-picker.view :as color-picker]
+    [reagent.core :as reagent]
     [test-helpers.component :as h]))
 
 (h/describe "color-picker"
@@ -11,7 +12,7 @@
       (-> (h/expect event)
           (.toHaveBeenCalled))))
   (h/test "color picker color changed"
-    (let [selected (atom nil)]
+    (let [selected (reagent/atom nil)]
       (h/render [color-picker/view {:on-change #(reset! selected %)}])
       (h/fire-event :press (get (h/get-all-by-label-text :color-picker-item) 0))
       (-> (h/expect @selected)

src/quo/components/community/channel_action/style.cljs

@@ -1,23 +0,0 @@
-(ns quo.components.community.channel-action.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn channel-action-container
-  [{:keys [big? disabled?]}]
-  (cond-> {}
-    disabled?  (assoc :opacity 0.3)
-    big?       (assoc :flex-grow 1)
-    (not big?) (assoc :width 104)))
-
-(defn channel-action
-  [{:keys [color pressed? theme]}]
-  {:height           102
-   :padding          12
-   :border-radius    16
-   :background-color (colors/resolve-color color theme (if pressed? 20 10))
-   :justify-content  :space-between})
-
-(def channel-action-row
-  {:flex-direction  :row
-   :justify-content :space-between
-   :align-items     :center})

src/quo/components/community/channel_action/view.cljs

@@ -1,39 +0,0 @@
-(ns quo.components.community.channel-action.view
-  (:require
-    [quo.components.community.channel-action.style :as style]
-    [quo.components.counter.counter.view :as counter]
-    [quo.components.icon :as icons]
-    [quo.components.markdown.text :as text]
-    [quo.theme]
-    [react-native.core :as rn]))
-
-(defn view
-  [{:keys [big? customization-color label counter-value icon on-press accessibility-label disabled?]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/view
-     {:style (style/channel-action-container
-              {:big?      big?
-               :disabled? disabled?})}
-     [rn/pressable
-      (cond-> {:style               (style/channel-action
-                                     {:big?      big?
-                                      :color     customization-color
-                                      :pressed?  pressed?
-                                      :theme     theme
-                                      :disabled? disabled?})
-               :accessibility-label accessibility-label}
-        (not disabled?) (assoc :on-press     on-press
-                               :on-press-in  on-press-in
-                               :on-press-out on-press-out))
-      [rn/view {:style style/channel-action-row}
-       [icons/icon icon]
-       (when counter-value
-         [counter/view {:type :secondary} counter-value])]
-      [text/text
-       {:size            :paragraph-1
-        :weight          :medium
-        :number-of-lines 2}
-       label]]]))

src/quo/components/community/channel_actions.cljs

@@ -0,0 +1,32 @@
+(ns quo.components.community.channel-actions
+  (:require
+    [quo.components.community.style :as style]
+    [quo.components.counter.counter.view :as counter]
+    [quo.components.icon :as icons]
+    [quo.components.markdown.text :as text]
+    [react-native.core :as rn]))
+
+(defn channel-action
+  [{:keys [big? color label counter-value icon on-press accessibility-label]}]
+  [rn/touchable-opacity
+   {:on-press            on-press
+    :style               (style/channel-action-touch big?)
+    :accessibility-label accessibility-label}
+   [rn/view {:style (style/channel-action color)}
+    [rn/view {:style style/channel-action-row}
+     [icons/icon icon]
+     (when counter-value
+       [counter/view {:type :secondary} counter-value])]
+    [text/text {:size :paragraph-1 :weight :medium :number-of-lines 2} label]]])
+
+(defn channel-actions
+  [{:keys [style actions]}]
+  [rn/view {:style (merge {:flex-direction :row :flex 1} style)}
+   (map-indexed
+    (fn [index action]
+      ^{:key index}
+      [:<>
+       [channel-action action]
+       (when (not= action (last actions))
+         [rn/view {:width 16}])])
+    actions)])

src/quo/components/community/channel_actions/view.cljs

@@ -1,16 +0,0 @@
-(ns quo.components.community.channel-actions.view
-  (:require
-    [quo.components.community.channel-action.view :as channel-action]
-    [react-native.core :as rn]))
-
-(defn view
-  [{:keys [container-style actions]}]
-  [rn/view {:style (assoc container-style :flex-direction :row)}
-   (map-indexed
-    (fn [index action]
-      ^{:key index}
-      [:<>
-       [channel-action/view action]
-       (when (not= action (last actions))
-         [rn/view {:width 16}])])
-    actions)])

src/quo/components/community/style.cljs

@@ -133,6 +133,25 @@
                       colors/neutral-80
                       theme)})
 
+(defn channel-action-touch
+  [big?]
+  {:flex      1
+   :max-width (if big? 216 104)})
+
+(defn channel-action
+  [color]
+  {:padding          12
+   :height           102
+   :flex             1
+   :border-radius    16
+   :background-color (colors/custom-color color 50 10)
+   :justify-content  :space-between})
+
+(def channel-action-row
+  {:flex-direction  :row
+   :justify-content :space-between
+   :align-items     :center})
+
 (defn loading-card
   [width theme]
   (merge

src/quo/components/counter/collectible_counter/view.cljs

@@ -11,7 +11,6 @@
    [:catn
     [:props
      [:map {:closed true}
-      [:container-style {:optional true} [:maybe :map]]
       [:value {:optional true} [:maybe [:or :string :int]]]
       [:status {:optional true} [:maybe :keyword]]
       [:size {:optional true} [:maybe [:enum :size-32 :size-24]]]
@@ -20,7 +19,7 @@
    :any])
 
 (defn- view-internal
-  [{:keys [value accessibility-label container-style]
+  [{:keys [value accessibility-label]
     :as   props}]
   (let [default-props {:status :default
                        :size   :size-32}
@@ -28,7 +27,7 @@
     [rn/view
      {:accessible          true
       :accessibility-label (or accessibility-label :collectible-counter)
-      :style               (merge (style/container props) container-style)}
+      :style               (style/container props)}
      [text/text
       {:weight :medium
        :size   (style/get-text-size props)

src/quo/components/drawers/bottom_actions/component_spec.cljs

@@ -59,15 +59,4 @@
               :button-one-label "Request to join"}])
     (h/is-truthy (h/get-by-text "Eligible to join as"))
     (h/is-truthy (h/get-by-text "Admin"))
-    (h/is-truthy (h/get-by-text "Request to join")))
-
-  (h/test "render with top description with custom text & 1 action"
-    (render [bottom-actions/view
-             {:description          :top
-              :role                 :admin
-              :actions              :one-action
-              :description-top-text "You'll be an"
-              :button-one-label     "Request to join"}])
-    (h/is-truthy (h/get-by-text "You'll be an"))
-    (h/is-truthy (h/get-by-text "Admin"))
     (h/is-truthy (h/get-by-text "Request to join"))))

src/quo/components/drawers/bottom_actions/view.cljs

@@ -19,7 +19,6 @@
       [:actions [:maybe [:enum :one-action :two-actions]]]
       [:description {:optional true} [:maybe [:enum :top :bottom :top-error]]]
       [:description-text {:optional true} [:maybe :string]]
-      [:description-top-text {:optional true} [:maybe :string]]
       [:error-message {:optional true} [:maybe :string]]
       [:role {:optional true} [:maybe [:enum :admin :member :token-master :owner]]]
       [:button-one-label {:optional true} [:maybe :string]]
@@ -39,8 +38,8 @@
    :owner        :i/crown})
 
 (defn- view-internal
-  [{:keys [actions description description-text description-top-text error-message role button-one-label
-           button-two-label blur? button-one-props button-two-props theme scroll? container-style]}]
+  [{:keys [actions description description-text error-message role button-one-label button-two-label
+           blur? button-one-props button-two-props theme scroll? container-style]}]
   [rn/view
    {:style (merge (style/container scroll? blur? theme) container-style)}
    (when (= description :top-error)
@@ -55,11 +54,12 @@
        error-message]])
 
    (when (and (= description :top) role)
-     [rn/view {:style style/description-top}
+     [rn/view
+      {:style style/description-top}
       [text/text
        {:size  :paragraph-2
         :style (style/description-top-text scroll? blur? theme)}
-       (or description-top-text (i18n/label :t/eligible-to-join-as))]
+       (i18n/label :t/eligible-to-join-as)]
       [context-tag/view
        {:type    :icon
         :size    24

src/quo/components/drawers/drawer_top/component_spec.cljs

@@ -65,7 +65,7 @@
                                    {:title                "Title"
                                     :type                 :account
                                     :account-avatar-emoji "🍿"
-                                    :networks             [{:network-name :ethereum :short-name "eth"}]
+                                    :networks             [{:name :ethereum :short-name "eth"}]
                                     :description          "0x62b...0a5"
                                     :customization-color  :purple}]
                                   theme)

src/quo/components/drawers/drawer_top/view.cljs

@@ -76,8 +76,7 @@
    (str description " · " (i18n/label :t/on-device))])
 
 (defn- context-tag-subtitle
-  [{:keys [context-tag-type community-logo community-name account-name emoji customization-color
-           full-name profile-picture]}]
+  [{:keys [context-tag-type community-logo community-name account-name emoji customization-color]}]
   (let [tag-type (or context-tag-type :account)]
     [rn/view
      {:accessibility-label :context-tag-wrapper
@@ -89,9 +88,7 @@
        :community-name      community-name
        :community-logo      community-logo
        :size                24
-       :customization-color customization-color
-       :profile-picture     profile-picture
-       :full-name           full-name}]]))
+       :customization-color customization-color}]]))
 
 (defn- description-subtitle
   [{:keys [theme blur? description]}]
@@ -103,7 +100,7 @@
 
 (defn- subtitle
   [{:keys [type theme blur? keycard? networks description community-name community-logo
-           context-tag-type account-name emoji customization-color full-name profile-picture]}]
+           context-tag-type account-name emoji customization-color]}]
   (cond
     (= :keypair type)
     [keypair-subtitle
@@ -131,9 +128,7 @@
       :community-name      community-name
       :account-name        account-name
       :emoji               emoji
-      :customization-color customization-color
-      :profile-picture     profile-picture
-      :full-name           full-name}]
+      :customization-color customization-color}]
 
     (and (not= :label type) description)
     [description-subtitle
@@ -192,7 +187,7 @@
            on-button-press
            on-button-long-press
            button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
-           profile-picture keycard? networks label full-name]}]
+           profile-picture keycard? networks label]}]
   [rn/view {:style style/container}
    (when (left-image-supported-types type)
      [rn/view {:style style/left-container}
@@ -223,9 +218,7 @@
       :context-tag-type    context-tag-type
       :customization-color customization-color
       :account-name        account-name
-      :emoji               emoji
-      :full-name           full-name
-      :profile-picture     profile-picture}]]
+      :emoji               emoji}]]
    [right-icon
     {:theme                theme
      :type                 type

src/quo/components/gradient/gradient_cover/style.cljs

@@ -2,10 +2,5 @@
 
 (defn root-container
   [opacity height]
-  {:height   (or height 252)
-   :opacity  opacity
-   :position :absolute
-   :top      0
-   :left     0
-   :right    0
-   :z-index  -1})
+  {:height  (or height 252)
+   :opacity opacity})

src/quo/components/header.cljs

@@ -6,7 +6,8 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [reagent.core :as reagent]))
 
 (def header-height 56)
 
@@ -56,7 +57,7 @@
    :justify-content :center
    :align-items     :flex-end})
 
-(defn get-title-style
+(defn title-style
   [{:keys [left right]} title-align]
   (merge
    absolute-fill
@@ -132,77 +133,76 @@
              :size            :large}
             title])])
 
-(defn header
-  [{:keys [left-accessories left-component border-bottom left-width right-width
-           right-accessories right-component insets get-layout
-           title subtitle title-component style title-align
-           background]
-    :or   {title-align   :center
-           border-bottom false}}]
-  (let [theme               (quo.theme/use-theme-value)
-        [layout set-layout] (rn/use-state {:left  {:width  (or left-width 8)
-                                                   :height header-height}
-                                           :right {:width  (or right-width 8)
-                                                   :height header-height}
-                                           :title {:width  0
-                                                   :height header-height}})
-        handle-layout       (rn/use-callback
-                             (fn [el get-layout]
-                               (fn [evt]
-                                 (let [width  (oget evt "nativeEvent" "layout" "width")
-                                       height (oget evt "nativeEvent" "layout" "height")]
-                                   (when get-layout
-                                     (get-layout el
-                                                 {:width  width
-                                                  :height height}))
-                                   (set-layout
-                                    (assoc layout
-                                           el
-                                           {:width  width
-                                            :height height})))))
-                             [layout])
-        status-bar-height   (get insets :top 0)
-        height              (+ header-height status-bar-height)
-        title-style         (rn/use-memo (fn [] (get-title-style layout title-align))
-                                         [layout title-align])]
-    [reanimated/view
-     {:style (header-wrapper-style {:height        height
-                                    :background    background
-                                    :border-bottom border-bottom
-                                    :theme         theme})}
-     [rn/view
-      {:pointer-events :box-none
-       :height         status-bar-height}]
-     [rn/view
-      {:style          (merge {:height header-height}
-                              style)
-       :pointer-events :box-none}
-      [rn/view
-       {:style          absolute-fill
-        :pointer-events :box-none}
-       [rn/view
-        {:style          content
-         :pointer-events :box-none}
-        [rn/view
-         {:style          left-style
-          :on-layout      (handle-layout :left get-layout)
-          :pointer-events :box-none}
-         [header-actions
-          {:accessories left-accessories
-           :component   left-component}]]
-        [rn/view
-         {:style          title-style
-          :on-layout      (handle-layout :title get-layout)
-          :pointer-events :box-none}
-         [header-title
-          {:title       title
-           :subtitle    subtitle
-           :title-align title-align
-           :component   title-component}]]
-        [rn/view
-         {:style          right-style
-          :on-layout      (handle-layout :right get-layout)
-          :pointer-events :box-none}
-         [header-actions
-          {:accessories right-accessories
-           :component   right-component}]]]]]]))
+(defn- header-internal
+  [{:keys [left-width right-width]}]
+  (let [layout        (reagent/atom {:left  {:width  (or left-width 8)
+                                             :height header-height}
+                                     :right {:width  (or right-width 8)
+                                             :height header-height}
+                                     :title {:width  0
+                                             :height header-height}})
+        handle-layout (fn [el get-layout]
+                        (fn [evt]
+                          (let [width  (oget evt "nativeEvent" "layout" "width")
+                                height (oget evt "nativeEvent" "layout" "height")]
+                            (when get-layout
+                              (get-layout el
+                                          {:width  width
+                                           :height height}))
+                            (swap! layout assoc
+                              el
+                              {:width  width
+                               :height height}))))]
+    (fn
+      [{:keys [left-accessories left-component border-bottom
+               right-accessories right-component insets get-layout
+               title subtitle title-component style title-align
+               background theme]
+        :or   {title-align   :center
+               border-bottom false}}]
+      (let [status-bar-height (get insets :top 0)
+            height            (+ header-height status-bar-height)]
+        [reanimated/view
+         {:style (header-wrapper-style {:height        height
+                                        :background    background
+                                        :border-bottom border-bottom
+                                        :theme         theme})}
+         [rn/view
+          {:pointer-events :box-none
+           :height         status-bar-height}]
+         [rn/view
+          {:style          (merge {:height header-height}
+                                  style)
+           :pointer-events :box-none}
+          [rn/view
+           {:style          absolute-fill
+            :pointer-events :box-none}
+           [rn/view
+            {:style          content
+             :pointer-events :box-none}
+            [rn/view
+             {:style          left-style
+              :on-layout      (handle-layout :left get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories left-accessories
+               :component   left-component}]]
+
+            [rn/view
+             {:style          (title-style @layout title-align)
+              :on-layout      (handle-layout :title get-layout)
+              :pointer-events :box-none}
+             [header-title
+              {:title       title
+               :subtitle    subtitle
+               :title-align title-align
+               :component   title-component}]]
+            [rn/view
+             {:style          right-style
+              :on-layout      (handle-layout :right get-layout)
+              :pointer-events :box-none}
+             [header-actions
+              {:accessories right-accessories
+               :component   right-component}]]]]]]))))
+
+(def header (quo.theme/with-theme header-internal))

src/quo/components/info/information_box/style.cljs

@@ -3,7 +3,7 @@
     [quo.foundations.colors :as colors]))
 
 (def ^:private themes
-  {:light {:default      {:bg     colors/neutral-5
+  {:light {:default      {:bg     colors/white
                           :border colors/neutral-20
                           :icon   colors/neutral-50
                           :text   colors/neutral-100}

src/quo/components/inputs/input/view.cljs

@@ -55,17 +55,16 @@
 
 (def ^:private custom-props
   "Custom properties that must be removed from properties map passed to InputText."
-  [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
+  [:type :blur? :theme :error? :right-icon :left-icon :disabled? :small? :button
    :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
    :container-style])
 
 (defn- base-input
-  [{:keys [blur? error? right-icon left-icon disabled? small? button
+  [{:keys [blur? theme error? right-icon left-icon disabled? small? button
            label char-limit multiline? clearable? on-focus on-blur container-style
            on-change-text on-char-limit-reach weight default-value]
     :as   props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [status set-status]    (rn/use-state :default)
+  (let [[status set-status]    (rn/use-state :default)
         internal-on-focus      (rn/use-callback #(set-status :focus))
         internal-on-blur       (rn/use-callback #(set-status :default))
         [multiple-lines?

src/quo/components/inputs/locked_input/style.cljs

@@ -10,7 +10,7 @@
    :background-color   (colors/theme-colors colors/neutral-10
                                             colors/neutral-80-opa-80
                                             theme)
-   :min-height         40
+   :height             40
    :padding-horizontal 12
    :padding-vertical   9
    :margin-top         4})

src/quo/components/inputs/locked_input/view.cljs

@@ -22,12 +22,11 @@
 (defn- locked-input-internal
   [{:keys [label icon container-style theme]} value]
   [rn/view {:style container-style}
-   (when label
-     [text/text
-      {:size   :paragraph-2
-       :weight :medium
-       :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
-      label])
+   [text/text
+    {:size   :paragraph-2
+     :weight :medium
+     :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+    label]
    [info-box
     {:theme      theme
      :icon       icon

src/quo/components/links/internal_link_card/community/style.cljs

@@ -60,8 +60,8 @@
    :padding-horizontal 12
    :padding-top        10
    :padding-bottom     12
-   :width              (if (= :message size) 295 335)
-   :flex               1})
+   :height             (if (= :message size) 245 266)
+   :width              (if (= :message size) 295 335)})
 
 (def header-container
   {:flex-direction :row

src/quo/components/links/link_preview/component_spec.cljs

@@ -7,6 +7,7 @@
   {:title       "Some title"
    :description "Some description"
    :link        "status.im"
+   :logo        "data:image/png,logo-x"
    :thumbnail   "data:image/png,whatever"})
 
 (h/describe "Links - Link Preview"
@@ -20,12 +21,17 @@
     (h/is-truthy (h/query-by-text (:title props)))
     (h/is-truthy (h/query-by-text (:description props)))
     (h/is-truthy (h/query-by-text (:link props)))
+    (h/is-truthy (h/query-by-label-text :logo))
     (h/is-truthy (h/query-by-label-text :thumbnail)))
 
   (h/test "does not render thumbnail if prop is not present"
     (h/render [view/view (dissoc props :thumbnail)])
     (h/is-null (h/query-by-label-text :thumbnail)))
 
+  (h/test "does not render logo if prop is not present"
+    (h/render [view/view (dissoc props :logo)])
+    (h/is-null (h/query-by-label-text :logo)))
+
   (h/test "shows button to enable preview when preview is disabled"
     (h/render [view/view
                (assoc props

src/quo/components/links/link_preview/view.cljs

@@ -1,14 +1,9 @@
 (ns quo.components.links.link-preview.view
   (:require
-    ["react-native-blob-util" :default ReactNativeBlobUtil]
-    [oops.core :as oops]
     [quo.components.buttons.button.view :as button]
     [quo.components.links.link-preview.style :as style]
     [quo.components.markdown.text :as text]
-    [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.svg :as svg]
-    [taoensso.timbre :as log]))
+    [react-native.core :as rn]))
 
 (defn- button-disabled
   [disabled-text on-enable]
@@ -56,30 +51,14 @@
                            thumbnail)
     :accessibility-label :thumbnail}])
 
-(defn- get-image-data
-  [logo set-is-svg on-success]
-  (-> (.config ReactNativeBlobUtil (clj->js {:trusty platform/ios?}))
-      (.fetch "GET" logo)
-      (.then (fn [imgObj]
-               (set-is-svg (= "image/svg"
-                              (oops/oget imgObj
-                                         ["respInfo" "headers" "Content-Type"])))
-               (on-success (oops/oget imgObj "data"))))
-      (.catch #(log/error "could not fetch favicon " logo))))
-
 (defn- logo-comp
   [logo]
-  (let [[image-data set-image-data] (rn/use-state nil)
-        [is-svg? set-is-svg]        (rn/use-state nil)
-        on-success                  (fn [data-uri]
-                                      (set-image-data data-uri))
-        _get-image-data             (get-image-data logo set-is-svg on-success)]
-    (if is-svg?
-      [svg/svg-xml (merge style/logo {:xml image-data})]
-      [rn/image
-       {:accessibility-label :logo
-        :source              {:uri (str "data:image/png;base64," image-data)}
-        :style               style/logo}])))
+  [rn/image
+   {:accessibility-label :logo
+    :source              (if (string? logo)
+                           {:uri logo}
+                           logo)
+    :style               style/logo}])
 
 (defn view
   [{:keys [title logo description link thumbnail

src/quo/components/links/url_preview/style.cljs

@@ -21,7 +21,6 @@
    :border-radius   12
    :border-style    :dashed
    :align-items     :center
-   :flex-direction  :row
    :justify-content :center
    :align-self      :stretch
    :padding         horizontal-padding

src/quo/components/links/url_preview/view.cljs

@@ -1,31 +1,19 @@
 (ns quo.components.links.url-preview.view
   (:require
-    [clojure.string :as string]
     [quo.components.icon :as icon]
     [quo.components.links.url-preview.style :as style]
     [quo.components.markdown.text :as text]
     [quo.foundations.colors :as colors]
-    [react-native.core :as rn]
-    [react-native.svg :as svg]))
-
-(def base64-svg-prefix "data:image/svg;base64,")
+    [react-native.core :as rn]))
 
 (defn- logo-comp
   [{:keys [logo]}]
-  (if (and (string? logo)
-           (string/starts-with? logo base64-svg-prefix))
-    [svg/svg-xml
-     (merge style/logo
-            {:xml (-> logo
-                      (string/replace base64-svg-prefix "")
-                      js/atob)})]
-    [rn/image
-     {:accessibility-label :logo
-      :source              (if (string? logo)
-                             {:uri logo}
-                             logo)
-      :style               style/logo
-      :resize-mode         :cover}]))
+  [rn/image
+   {:accessibility-label :logo
+    :source              (if (string? logo)
+                           {:uri logo}
+                           logo)
+    :style               style/logo}])
 
 (defn- content
   [{:keys [title body]}]
@@ -62,10 +50,6 @@
     [rn/view
      {:accessibility-label :url-preview-loading
       :style               (merge (style/loading-container) container-style)}
-     [icon/icon :i/loading
-      {:size            12
-       :color           (colors/theme-colors colors/neutral-50 colors/neutral-40)
-       :container-style {:margin-right 8}}]
      [rn/text
       {:size            :paragraph-2
        :weight          :medium
@@ -76,9 +60,6 @@
      {:accessibility-label :url-preview
       :style               (merge (style/container) container-style)}
      (when logo
-       [logo-comp
-        {:logo (if (map? logo)
-                 (:data-uri logo)
-                 logo)}])
+       [logo-comp {:logo logo}])
      [content {:title title :body body}]
      [clear-button {:on-press on-clear}]]))

src/quo/components/links/url_preview_list/view.cljs

@@ -32,7 +32,7 @@
   [rn/view {:style style/url-preview-separator}])
 
 (defn- item-component
-  [{:keys [title body loading? logo url]} _ _
+  [{:keys [title body loading? logo]} _ _
    {:keys [width on-clear loading-message container-style]}]
   [url-preview/view
    {:logo            logo
@@ -41,8 +41,7 @@
     :loading?        loading?
     :loading-message loading-message
     :on-clear        on-clear
-    :container-style (merge container-style {:width width})
-    :url             url}])
+    :container-style (merge container-style {:width width})}])
 
 (defn- f-view
   []

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

@@ -6,101 +6,71 @@
 
 (def ^:private theme :light)
 
-(def ^:private default-props
-  {:account-props {:name                "Account name"
-                   :address             "0x1234567890"
-                   :emoji               "🍑"
-                   :customization-color "blue"}})
-
-(defn- with-defaults
-  ([] default-props)
-  ([props] (merge default-props props)))
-
 (h/describe "List items: account"
   (h/test "default render'"
-    (h/render-with-theme-provider [account/view (with-defaults)] theme)
+    (h/render-with-theme-provider [account/view] theme)
     (h/is-truthy (h/query-by-label-text :container)))
 
   (h/test "on-press-in changes state to :pressed"
-    (h/render-with-theme-provider [account/view (with-defaults)] theme)
+    (h/render-with-theme-provider [account/view] theme)
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor (colors/resolve-color :blue :light 5)})))
 
   (h/test "on-press-in changes state to :pressed with blur? enabled"
-    (h/render-with-theme-provider [account/view (with-defaults {:blur? true})] theme)
+    (h/render-with-theme-provider [account/view {:blur? true}] theme)
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor colors/white-opa-5})))
 
   (h/test "render with state :active"
-    (h/render-with-theme-provider [account/view (with-defaults {:state :active})] theme)
+    (h/render-with-theme-provider [account/view {:state :active}] theme)
     (h/has-style (h/query-by-label-text :container)
                  {:backgroundColor (colors/resolve-color :blue :light 10)}))
 
   (h/test "render with state :active and blur? enabled"
     (h/render-with-theme-provider [account/view
-                                   (with-defaults
-                                    {:blur? true
-                                     :state :active})]
+                                   {:blur? true
+                                    :state :active}]
                                   theme)
     (h/has-style (h/query-by-label-text :container)
                  {:backgroundColor colors/white-opa-10}))
 
   (h/test "render with state :selected"
-    (h/render-with-theme-provider [account/view (with-defaults {:state :selected})] theme)
+    (h/render-with-theme-provider [account/view {:state :selected}] theme)
     (h/is-truthy (h/query-by-label-text :check-icon)))
 
   (h/test "calls on-press"
     (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider [account/view (with-defaults {:on-press on-press})] theme)
+      (h/render-with-theme-provider [account/view {:on-press on-press}] theme)
       (h/fire-event :on-press (h/get-by-label-text :container))
       (h/was-called on-press)))
 
   (h/test "renders token props if type :tag"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type        :tag
-                                                   :token-props {:symbol "SNT"
-                                                                 :value  "1,000"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :tag}] theme)
     (h/is-truthy (h/query-by-label-text :tag-container)))
 
   (h/test "renders keycard icon if title-icon is present"
-    (h/render-with-theme-provider [account/view (with-defaults {:title-icon :i/placeholder})] theme)
+    (h/render-with-theme-provider [account/view {:title-icon :i/placeholder}] theme)
     (h/is-truthy (h/query-by-label-text :title-icon)))
 
   (h/test "doesn't render keycard icon if title-icon is missing"
-    (h/render-with-theme-provider [account/view (with-defaults)] theme)
+    (h/render-with-theme-provider [account/view] theme)
     (h/is-falsy (h/query-by-label-text :title-icon)))
 
   (h/test "renders balance container but not arrow icon if type :balance-neutral"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-neutral
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-neutral}] theme)
     (h/is-truthy (h/query-by-label-text :balance-container))
     (h/is-falsy (h/query-by-label-text :arrow-icon)))
 
   (h/test "renders balance container and negative arrow icon if type :balance-negative"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-negative
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-negative}] theme)
     (h/is-truthy (h/query-by-label-text :balance-container))
     (h/is-truthy (h/query-by-label-text :icon-negative))
     (h/is-falsy (h/query-by-label-text :icon-positive)))
 
   (h/test "renders balance container and positive arrow icon if type :balance-positive"
-    (h/render-with-theme-provider [account/view
-                                   (with-defaults {:type          :balance-positive
-                                                   :balance-props {:fiat-value        "€0.00"
-                                                                   :percentage-change "0.0"
-                                                                   :fiat-change       "€0.00"}})]
-                                  theme)
+    (h/render-with-theme-provider [account/view {:type :balance-positive}] theme)
     (h/is-truthy (h/query-by-label-text :balance-container))
     (h/is-falsy (h/query-by-label-text :icon-negative))
     (h/is-truthy (h/query-by-label-text :icon-positive)))
@@ -108,9 +78,8 @@
   (h/test "renders options button if type :action"
     (let [on-options-press (h/mock-fn)]
       (h/render-with-theme-provider [account/view
-                                     (with-defaults
-                                      {:type             :action
-                                       :on-options-press on-options-press})]
+                                     {:type             :action
+                                      :on-options-press on-options-press}]
                                     theme)
       (h/is-truthy (h/query-by-label-text :options-button))
       (h/fire-event :on-press (h/get-by-label-text :options-button))

src/quo/components/list_items/account/schema.cljs

@@ -1,49 +0,0 @@
-(ns quo.components.list-items.account.schema)
-
-(def ^:private ?balance
-  [:map
-   [:balance-props
-    [:map
-     [:fiat-value :string]
-     [:percentage-change :string]
-     [:fiat-change :string]]]])
-
-(def ^:private ?tag
-  [:map
-   [:token-props
-    [:map
-     [:symbol :string]
-     [:value :string]]]])
-
-(def ^:private ?action
-  [:map
-   [:on-options-press {:optional true} [:maybe fn?]]])
-
-(def ^:private ?base
-  [:map
-   [:type {:optional true}
-    [:enum :default :tag :action :balance-neutral :balance-negative :balance-positive]]
-   [:state {:optional true} [:enum :default :selected :active]]
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-   [:on-press {:optional true} [:maybe fn?]]
-   [:title-icon {:optional true} [:maybe :keyword]]
-   [:account-props
-    [:map
-     [:name :string]
-     [:address :string]
-     [:emoji :string]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:multi {:dispatch :type}
-     [:balance-neutral [:merge ?base ?balance]]
-     [:balance-negative [:merge ?base ?balance]]
-     [:balance-positive [:merge ?base ?balance]]
-     [:tag [:merge ?base ?tag]]
-     [:action [:merge ?base ?action]]
-     [:default ?base]
-     [:malli.core/default ?base]]]
-   :any])

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

@@ -2,14 +2,13 @@
   (:require
     [quo.components.avatars.account-avatar.view :as account-avatar]
     [quo.components.icon :as icon]
-    [quo.components.list-items.account.schema :as component-schema]
     [quo.components.list-items.account.style :as style]
     [quo.components.markdown.text :as text]
     [quo.components.wallet.address-text.view :as address-text]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [schema.core :as schema]))
+    [reagent.core :as reagent]))
 
 (defn- account-view
   [{:keys [account-props title-icon blur? theme]}]
@@ -96,40 +95,39 @@
               (colors/resolve-color customization-color theme))}]])
 
 (defn- internal-view
-  [{:keys [type state blur? customization-color on-press]
-    :or   {customization-color :blue
-           type                :default
-           state               :default
-           blur?               false}
-    :as   props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))
-        props                  (assoc props :theme theme)]
-    [rn/pressable
-     {:style               (style/container
-                            {:state               state
-                             :blur?               blur?
-                             :customization-color customization-color
-                             :pressed?            pressed?})
-      :on-press-in         on-press-in
-      :on-press            on-press
-      :on-press-out        on-press-out
-      :accessibility-label :container}
-     [account-view props]
-     [rn/view {:style (when (= type :tag) style/token-tag-container)}
-      (cond
-        (#{:balance-neutral :balance-negative :balance-positive} type)
-        [balance-view props]
+  [_]
+  (let [pressed?     (reagent/atom false)
+        on-press-in  #(reset! pressed? true)
+        on-press-out #(reset! pressed? false)]
+    (fn [{:keys [type state blur? customization-color on-press]
+          :or   {customization-color :blue
+                 type                :default
+                 state               :default
+                 blur?               false}
+          :as   props}]
+      [rn/pressable
+       {:style               (style/container
+                              {:state               state
+                               :blur?               blur?
+                               :customization-color customization-color
+                               :pressed?            @pressed?})
+        :on-press-in         on-press-in
+        :on-press            on-press
+        :on-press-out        on-press-out
+        :accessibility-label :container}
+       [account-view props]
+       [rn/view {:style (when (= type :tag) style/token-tag-container)}
+        (cond
+          (#{:balance-neutral :balance-negative :balance-positive} type)
+          [balance-view props]
 
-        (= type :tag)
-        [token-tag props]
+          (= type :tag)
+          [token-tag props]
 
-        (= type :action)
-        [options-button props]
+          (= type :action)
+          [options-button props]
 
-        (and (= type :default) (= state :selected))
-        [check-icon props])]]))
+          (and (= type :default) (= state :selected))
+          [check-icon props])]])))
 
-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))

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

@@ -13,9 +13,9 @@
 
 (h/describe "List items: account list card"
   (h/test "Test icon renders for ':action :icon'"
-    (h/render-with-theme-provider [account-list-card/view
-                                   {:account-props    account-props
-                                    :network          :ethereum
-                                    :action           :icon
-                                    :on-options-press (fn [])}])
+    (h/render [account-list-card/view
+               {:account-props account-props
+                :network       :ethereum
+                :state         :default
+                :action        :icon}])
     (h/is-truthy (h/get-by-label-text :icon))))

src/quo/components/list_items/account_list_card/schema.cljs

@@ -1,29 +0,0 @@
-(ns quo.components.list-items.account-list-card.schema)
-
-(def ^:private ?base
-  [:map
-   [:action {:optional true} [:enum :icon :none]]
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:on-press {:optional true} [:maybe fn?]]
-   [:account-props
-    [:map {:closed true}
-     [:type [:enum :default :watch-only]]
-     [:name :string]
-     [:address :string]
-     [:emoji :string]
-     [:size {:optional true} [:enum 80 :size-64 48 32 28 24 20 16]]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]
-   [:networks {:optional true} [:* [:map [:network-name :keyword] [:short-name :string]]]]])
-
-(def ^:private ?on-option-press
-  [:map
-   [:on-options-press [:maybe fn?]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:multi {:dispatch :action}
-     [:icon [:merge ?base ?on-option-press]]
-     [:none ?base]
-     [:malli.core/default ?base]]]
-   :any])

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

@@ -2,44 +2,41 @@
   (:require
     [quo.components.avatars.account-avatar.view :as account-avatar]
     [quo.components.icon :as icon]
-    [quo.components.list-items.account-list-card.schema :as component-schema]
     [quo.components.list-items.account-list-card.style :as style]
     [quo.components.markdown.text :as text]
     [quo.components.wallet.address-text.view :as address-text]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [schema.core :as schema]))
+    [reagent.core :as reagent]))
 
 (defn- internal-view
-  [{:keys [action blur? account-props networks on-press on-options-press]}]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        on-press-in       (rn/use-callback #(set-state :pressed))
-        on-press-out      (rn/use-callback #(set-state :default))]
-    [rn/pressable
-     {:style               (style/container {:state state :blur? blur? :theme theme})
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :container}
-     [rn/view {:style style/left-container}
-      [account-avatar/view account-props]
-      [rn/view {:style {:margin-left 8}}
-       [text/text
-        {:weight :semi-bold
-         :size   :paragraph-2}
-        (:name account-props)]
-       [address-text/view
-        {:networks networks
-         :address  (:address account-props)
-         :format   :short}]]]
-     (when (= action :icon)
-       [rn/pressable {:on-press on-options-press}
-        [icon/icon :i/options
-         {:color               (if blur?
-                                 colors/white-opa-70
-                                 (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))
-          :accessibility-label :icon}]])]))
+  []
+  (let [state (reagent/atom :default)]
+    (fn [{:keys [action blur? account-props networks on-press on-options-press theme]}]
+      [rn/pressable
+       {:style               (style/container {:state @state :blur? blur? :theme theme})
+        :on-press-in         #(reset! state :pressed)
+        :on-press-out        #(reset! state :default)
+        :on-press            on-press
+        :accessibility-label :container}
+       [rn/view {:style style/left-container}
+        [account-avatar/view account-props]
+        [rn/view {:style {:margin-left 8}}
+         [text/text
+          {:weight :semi-bold
+           :size   :paragraph-2}
+          (:name account-props)]
+         [address-text/view
+          {:networks networks
+           :address  (:address account-props)
+           :format   :short}]]]
+       (when (= action :icon)
+         [rn/pressable {:on-press on-options-press}
+          [icon/icon :i/options
+           {:color               (if blur?
+                                   colors/white-opa-70
+                                   (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))
+            :accessibility-label :icon}]])])))
 
-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))

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

@@ -4,36 +4,32 @@
     [quo.foundations.colors :as colors]
     [test-helpers.component :as h]))
 
-(defn- with-defaults
-  ([] (with-defaults {}))
-  ([props] (merge {:address "0x0ah...78b"} props)))
-
 (h/describe "List items: address"
   (h/test "default render"
-    (h/render-with-theme-provider [address/view (with-defaults)])
+    (h/render [address/view])
     (h/is-truthy (h/query-by-label-text :container)))
 
   (h/test "on-press-in changes state to :pressed"
-    (h/render-with-theme-provider [address/view (with-defaults)])
+    (h/render [address/view])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor (colors/custom-color :blue 50 5)})))
 
   (h/test "on-press-in changes state to :pressed with blur? enabled"
-    (h/render-with-theme-provider [address/view (with-defaults {:blur? true})])
+    (h/render [address/view {:blur? true}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor colors/white-opa-5})))
 
   (h/test "on-press-out changes state to :active"
-    (h/render-with-theme-provider [address/view (with-defaults {:active-state? true})])
+    (h/render [address/view {:active-state? true}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/fire-event :on-press-out (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
                               {:backgroundColor (colors/custom-color :blue 50 10)})))
 
   (h/test "on-press-out changes state to :active with blur? enabled"
-    (h/render-with-theme-provider [address/view (with-defaults {:active-state? true :blur? true})])
+    (h/render [address/view {:active-state? true :blur? true}])
     (h/fire-event :on-press-in (h/get-by-label-text :container))
     (h/fire-event :on-press-out (h/get-by-label-text :container))
     (h/wait-for #(h/has-style (h/query-by-label-text :container)
@@ -41,6 +37,6 @@
 
   (h/test "on-press event is called"
     (let [on-press (h/mock-fn)]
-      (h/render-with-theme-provider [address/view (with-defaults {:on-press on-press})])
+      (h/render [address/view {:on-press on-press}])
       (h/fire-event :on-press (h/get-by-label-text :container))
       (h/was-called on-press))))

src/quo/components/list_items/address/schema.cljs

@@ -1,13 +0,0 @@
-(ns quo.components.list-items.address.schema)
-
-(def ?schema
-  [:=>
-   [:cat
-    [:map
-     [:address :string]
-     [:networks {:optional true} [:* [:map [:network-name :keyword] [:short-name :string]]]]
-     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-     [:on-press {:optional true} [:maybe fn?]]
-     [:blur? {:optional true} [:maybe :boolean]]
-     [:active-state? {:optional true} [:maybe :boolean]]]]
-   :any])

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

@@ -1,13 +1,12 @@
 (ns quo.components.list-items.address.view
   (:require
     [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
-    [quo.components.list-items.address.schema :as component-schema]
     [quo.components.list-items.address.style :as style]
     [quo.components.markdown.text :as text]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [schema.core :as schema]
+    [reagent.core :as reagent]
     [utils.address :as address]))
 
 (defn- left-container
@@ -38,35 +37,31 @@
       (address/get-shortened-key address)]]]])
 
 (defn- internal-view
-  [{:keys [networks address customization-color on-press active-state? blur?]
-    :or   {customization-color :blue}}]
-  (let [theme             (quo.theme/use-theme-value)
-        [state set-state] (rn/use-state :default)
-        active?           (rn/use-ref-atom false)
-        timer             (rn/use-ref-atom nil)
-        on-press-in       (rn/use-callback
-                           (fn []
-                             (when-not (= state :selected)
-                               (reset! timer (js/setTimeout #(set-state :pressed) 100))))
-                           [state])
-        on-press-out      (rn/use-callback
-                           (fn []
-                             (let [new-state (if (or (not active-state?) @active?) :default :active)]
-                               (when @timer (js/clearTimeout @timer))
-                               (reset! timer nil)
-                               (reset! active? (= new-state :active))
-                               (set-state new-state)))
-                           [active-state?])]
-    [rn/pressable
-     {:style               (style/container state customization-color blur?)
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :container}
-     [left-container
-      {:theme    theme
-       :networks networks
-       :address  address
-       :blur?    blur?}]]))
+  []
+  (let [state       (reagent/atom :default)
+        active?     (atom false)
+        timer       (atom nil)
+        on-press-in (fn []
+                      (when-not (= @state :selected)
+                        (reset! timer (js/setTimeout #(reset! state :pressed) 100))))]
+    (fn [{:keys [networks address customization-color on-press active-state? blur? theme]
+          :or   {customization-color :blue}}]
+      (let [on-press-out (fn []
+                           (let [new-state (if (or (not active-state?) @active?) :default :active)]
+                             (when @timer (js/clearTimeout @timer))
+                             (reset! timer nil)
+                             (reset! active? (= new-state :active))
+                             (reset! state new-state)))]
+        [rn/pressable
+         {:style               (style/container @state customization-color blur?)
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :on-press            on-press
+          :accessibility-label :container}
+         [left-container
+          {:theme    theme
+           :networks networks
+           :address  address
+           :blur?    blur?}]]))))
 
-(def view (schema/instrument #'internal-view component-schema/?schema))
+(def view (quo.theme/with-theme internal-view))

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

@@ -5,10 +5,11 @@
     [quo.components.icon :as quo.icons]
     [quo.components.list-items.channel.style :as style]
     [quo.components.markdown.text :as quo.text]
-    [quo.theme]
-    [react-native.core :as rn]))
+    [quo.theme :as theme]
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))
 
-(defn view
+(defn- view-internal
   "Options:
    - notification - (nil/:notification/:mention/:mute, default: nil):
      - :notification - Display a grey dot.
@@ -26,37 +27,38 @@
    - on-press - (function, default: nil) - Function called when the component is pressed.
    - on-long-press - (function, default: nil) - Function called when the component is long pressed.
    - theme - Theme value from with-theme HOC"
-  [{:keys [notification locked? mentions-count customization-color emoji name on-press on-long-press]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:style               (style/container pressed? customization-color theme)
-      :accessibility-label :channel-list-item
-      :on-press            on-press
-      :on-long-press       on-long-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out}
-     [channel-avatar/view
-      {:size                :size-32
-       :locked?             locked?
-       :full-name           name
-       :customization-color customization-color
-       :emoji               emoji}]
-     [quo.text/text
-      {:style  (style/label notification theme)
-       :weight :medium
-       :size   :paragraph-1} (str "# " name)]
-     (when-not locked?
-       (condp = notification
-         :mute         [quo.icons/icon :i/muted
-                        {:color (style/mute-notification-icon-color theme)}]
-         :mention      [counter/view
-                        {:customization-color customization-color
-                         :container-style     (style/counter mentions-count)}
-                        mentions-count]
-         :notification [quo.icons/icon :i/notification
-                        {:color               (style/mute-notification-icon-color theme)
-                         :accessibility-label :unviewed-messages-public}]
-         nil))]))
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [notification locked? mentions-count customization-color emoji name on-press
+                 on-long-press theme]}]
+      [rn/pressable
+       {:style               (style/container @pressed? customization-color theme)
+        :accessibility-label :channel-list-item
+        :on-press            on-press
+        :on-long-press       on-long-press
+        :on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? false)}
+       [channel-avatar/view
+        {:size                :size-32
+         :locked?             locked?
+         :full-name           name
+         :customization-color customization-color
+         :emoji               emoji}]
+       [quo.text/text
+        {:style  (style/label notification theme)
+         :weight :medium
+         :size   :paragraph-1} (str "# " name)]
+       (when-not locked?
+         (condp = notification
+           :mute         [quo.icons/icon :i/muted
+                          {:color (style/mute-notification-icon-color theme)}]
+           :mention      [counter/view
+                          {:customization-color customization-color
+                           :container-style     (style/counter mentions-count)}
+                          mentions-count]
+           :notification [quo.icons/icon :i/notification
+                          {:color               (style/mute-notification-icon-color theme)
+                           :accessibility-label :unviewed-messages-public}]
+           nil))])))
+
+(def view (theme/with-theme view-internal))

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

@@ -7,7 +7,8 @@
     [quo.components.markdown.text :as text]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [reagent.core :as reagent]))
 
 (defn- logo-component
   [logo]
@@ -82,7 +83,7 @@
         :style               {:margin-left 10}}
        component])))
 
-(defn view
+(defn- view-internal
   "Options:
 
   :type - :discover/engage/share
@@ -115,48 +116,49 @@
   :unread-count - number - When the info is :mention, it will be used to show
   the number of unread mentions.
   "
-  [{:keys [members type info tokens locked? title subtitle logo blur? customization-color
-           on-press on-long-press on-press-info container-style unread-count]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:accessibility-label :container
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [members type info tokens locked? title subtitle
+                 logo blur? customization-color
+                 on-press on-long-press on-press-info
+                 container-style unread-count theme]}]
+      [rn/pressable
+       {:accessibility-label :container
+        :on-press-in         (fn [] (reset! pressed? true))
+        :on-press            on-press
+        :on-long-press       on-long-press
+        :on-press-out        (fn [] (reset! pressed? false))
+        :style               (merge (style/container {:blur?               blur?
+                                                      :customization-color customization-color
+                                                      :info                info
+                                                      :type                type
+                                                      :pressed?            @pressed?
+                                                      :theme               theme})
+                                    container-style)}
+       [logo-component logo]
+       [rn/view {:style {:flex 1}}
+        [title-component
+         {:blur? blur?
+          :info  info
+          :theme theme
+          :title title
+          :type  type}]
+        (when (and (= type :share) subtitle)
+          [subtitle-component subtitle blur? theme])
+        (when (and members (= type :discover))
+          [community-view/community-stats-column
+           {:type          :list-view
+            :members-count (:members-count members)
+            :active-count  (:active-count members)}])]
+       [info-component
+        {:blur?               blur?
+         :customization-color customization-color
+         :info                info
+         :type                type
+         :locked?             locked?
+         :on-press-info       on-press-info
+         :theme               theme
+         :tokens              tokens
+         :unread-count        unread-count}]])))
 
-      :on-press            on-press
-      :on-long-press       on-long-press
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :style               (merge (style/container {:blur?               blur?
-                                                    :customization-color customization-color
-                                                    :info                info
-                                                    :type                type
-                                                    :pressed?            pressed?
-                                                    :theme               theme})
-                                  container-style)}
-     [logo-component logo]
-     [rn/view {:style {:flex 1}}
-      [title-component
-       {:blur? blur?
-        :info  info
-        :theme theme
-        :title title
-        :type  type}]
-      (when (and (= type :share) subtitle)
-        [subtitle-component subtitle blur? theme])
-      (when (and members (= type :discover))
-        [community-view/community-stats-column
-         {:type          :list-view
-          :members-count (:members-count members)
-          :active-count  (:active-count members)}])]
-     [info-component
-      {:blur?               blur?
-       :customization-color customization-color
-       :info                info
-       :type                type
-       :locked?             locked?
-       :on-press-info       on-press-info
-       :theme               theme
-       :tokens              tokens
-       :unread-count        unread-count}]]))
+(def view (quo.theme/with-theme view-internal))

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

@@ -6,41 +6,43 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]))
+    [react-native.fast-image :as fast-image]
+    [reagent.core :as reagent]))
 
-(defn view
-  [{:keys [dapp action on-press on-press-icon] :as props}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/pressable
-     {:style        (style/container (assoc props :pressed? pressed?))
-      :on-press     on-press
-      :on-press-in  on-press-in
-      :on-press-out on-press-out}
-     [rn/view {:style style/container-info}
-      [fast-image/fast-image
-       {:source (:avatar dapp)
-        :style  {:width 32 :height 32}}]
-      [rn/view {:style style/user-info}
-       [text/text
-        {:weight :semi-bold
-         :size   :paragraph-1
-         :style  (style/style-text-name theme)}
-        (:name dapp)]
-       [text/text
-        {:weight :regular
-         :size   :paragraph-2
-         :style  (style/style-text-value theme)}
-        (:value dapp)]]]
-     (when (= action :icon)
-       [rn/pressable
-        {:on-press on-press-icon
-         :testID   "dapp-component-icon"}
-        [icons/icon :i/options
-         {:color               (colors/theme-colors
-                                colors/neutral-50
-                                colors/neutral-40
-                                theme)
-          :accessibility-label :icon}]])]))
+(defn- view-internal
+  []
+  (let [pressed? (reagent/atom false)]
+    (fn [{:keys [dapp action on-press on-press-icon theme] :as props}]
+      [rn/pressable
+       {:style        (style/container (assoc props :pressed? @pressed?))
+        :on-press     on-press
+        :on-press-in  #(reset! pressed? true)
+        :on-press-out #(reset! pressed? false)}
+       [rn/view {:style style/container-info}
+        [fast-image/fast-image
+         {:source (:avatar dapp)
+          :style  {:width 32 :height 32}}]
+        [rn/view {:style style/user-info}
+         [text/text
+          {:weight :semi-bold
+           :size   :paragraph-1
+           :style  (style/style-text-name theme)}
+          (:name dapp)]
+         [text/text
+          {:weight :regular
+           :size   :paragraph-2
+           :style  (style/style-text-value theme)}
+          (:value dapp)]]]
+       (when (= action :icon)
+         [rn/pressable
+          {:on-press on-press-icon
+           :testID   "dapp-component-icon"}
+          [icons/icon :i/options
+           {:color               (colors/theme-colors
+                                  colors/neutral-50
+                                  colors/neutral-40
+                                  theme)
+            :accessibility-label :icon}]])])))
+
+(def view
+  (quo.theme/with-theme view-internal))

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

@@ -5,6 +5,7 @@
     [quo.components.markdown.text :as text]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
+    [reagent.core :as reagent]
     [schema.core :as schema]))
 
 (defn- info
@@ -21,19 +22,18 @@
      (if (string/blank? label) "-" label)]]])
 
 (defn- values
-  [{:keys [token-value fiat-value]}]
-  (let [theme (quo.theme/use-theme-value)]
-    [rn/view {:style style/values-container}
-     [text/text
-      {:weight          :medium
-       :size            :paragraph-2
-       :number-of-lines 1}
-      token-value]
-     [text/text
-      {:style           (style/fiat-value theme)
-       :size            :paragraph-2
-       :number-of-lines 1}
-      fiat-value]]))
+  [{:keys [token-value fiat-value theme]}]
+  [rn/view {:style style/values-container}
+   [text/text
+    {:weight          :medium
+     :size            :paragraph-2
+     :number-of-lines 1}
+    token-value]
+   [text/text
+    {:style           (style/fiat-value theme)
+     :size            :paragraph-2
+     :number-of-lines 1}
+    fiat-value]])
 
 (def ?schema
   [:=>
@@ -51,21 +51,26 @@
    :any])
 
 (defn- view-internal
-  [{:keys [on-press state customization-color]
-    :as   props
-    :or   {customization-color :blue}}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))
-        internal-state         (if pressed? :pressed state)]
-    [rn/pressable
-     {:style               (style/container internal-state customization-color theme)
-      :on-press-in         on-press-in
-      :on-press-out        on-press-out
-      :on-press            on-press
-      :accessibility-label :network-list}
-     [info props]
-     [values props]]))
+  []
+  (let [pressed?     (reagent/atom false)
+        on-press-in  #(reset! pressed? true)
+        on-press-out #(reset! pressed? false)]
+    (fn [{:keys [on-press state customization-color theme]
+          :as   props
+          :or   {customization-color :blue}}]
+      (let [internal-state (if @pressed?
+                             :pressed
+                             state)]
 
-(def view (schema/instrument #'view-internal ?schema))
+        [rn/pressable
+         {:style               (style/container internal-state customization-color theme)
+          :on-press-in         on-press-in
+          :on-press-out        on-press-out
+          :on-press            on-press
+          :accessibility-label :network-list}
+         [info props]
+         [values props]]))))
+
+(def view
+  (quo.theme/with-theme
+   (schema/instrument #'view-internal ?schema)))