Merge branch 'develop' into issue-13832

Makefile

@@ -285,7 +285,7 @@ endif
 
 lint: export TARGET := clojure
 lint: ##@test Run code style checks
-	yarn clj-kondo --confg .clj-kondo/config.edn --lint src && \
+	yarn clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
 	TARGETS=$$(git diff --diff-filter=d --cached --name-only src && echo src) && \
 	clojure -Scp "$$CLASS_PATH" -m cljfmt.main check --indents indentation.edn $$TARGETS
 

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -1411,6 +1411,31 @@ public String identicon(final String seed) {
         return Statusgo.identicon(seed);
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String encodeTransfer(final String to, final String value) {
+        return Statusgo.encodeTransfer(to, value);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String encodeFunctionCall(final String method, final String paramsJSON) {
+        return Statusgo.encodeFunctionCall(method, paramsJSON);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String decodeParameters(final String decodeParamJSON) {
+        return Statusgo.decodeParameters(decodeParamJSON);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String hexToNumber(final String hex) {
+        return Statusgo.hexToNumber(hex);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String numberToHex(final String numString) {
+        return Statusgo.numberToHex(numString);
+    }
+
     @ReactMethod
     public void identiconAsync(final String seed, final Callback callback) {
         Log.d(TAG, "identiconAsync");
@@ -1572,5 +1597,6 @@ public void run() {
 
         StatusThreadPoolExecutor.getInstance().execute(r);
     }
+
 }
 

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

@@ -820,6 +820,28 @@ - (void) migrateKeystore:(NSString *)accountData
   return StatusgoIdenticon(publicKey);
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
+                                       value:(NSString *)value) {
+  return StatusgoEncodeTransfer(to,value);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeFunctionCall:(NSString *)method
+                                       paramsJSON:(NSString *)paramsJSON) {
+  return StatusgoEncodeFunctionCall(method,paramsJSON);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(decodeParameters:(NSString *)decodeParamJSON) {
+  return StatusgoDecodeParameters(decodeParamJSON);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToNumber:(NSString *)hex) {
+  return StatusgoHexToNumber(hex);
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(numberToHex:(NSString *)numString) {
+  return StatusgoNumberToHex(numString);
+}
+
 RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG

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

@@ -386,6 +386,182 @@ void _Identicon(const FunctionCallbackInfo<Value>& args) {
 
 }
 
+void _EncodeTransfer(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 2) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for EncodeTransfer")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'to'")));
+		return;
+	}
+
+	if (!args[1]->IsString()) {
+    		isolate->ThrowException(Exception::TypeError(
+    			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'value'")));
+    		return;
+    	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+	String::Utf8Value arg1Obj(isolate, args[1]->ToString(context).ToLocalChecked());
+    char *arg1 = *arg1Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = EncodeTransfer(arg0, arg1);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
+void _EncodeFunctionCall(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 2) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for EncodeFunctionCall")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'method'")));
+		return;
+	}
+
+	if (!args[1]->IsString()) {
+    		isolate->ThrowException(Exception::TypeError(
+    			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'paramsJSON'")));
+    		return;
+    	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+	String::Utf8Value arg1Obj(isolate, args[1]->ToString(context).ToLocalChecked());
+    char *arg1 = *arg1Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = EncodeFunctionCall(arg0, arg1);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
+void _DecodeParameters(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	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 DecodeParameters")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'decodeParamJSON'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = DecodeParameters(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
+void _HexToNumber(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 HexToNumber")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'hex'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = HexToNumber(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
+void _NumberToHex(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 NumberToHex")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'numString'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = NumberToHex(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _Logout(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
 
@@ -1583,6 +1759,11 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "identicon", _Identicon);
+	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
+	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);
+	NODE_SET_METHOD(exports, "decodeParameters", _DecodeParameters);
+	NODE_SET_METHOD(exports, "hexToNumber", _HexToNumber);
+	NODE_SET_METHOD(exports, "numberToHex", _NumberToHex);
 	NODE_SET_METHOD(exports, "logout", _Logout);
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
 	NODE_SET_METHOD(exports, "resetChainData", _ResetChainData);

package.json

@@ -68,7 +68,7 @@
     "react-native-safe-area-context": "^2.0.0",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^7.0.1",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.37",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.38",
     "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
@@ -83,7 +83,7 @@
     "@babel/preset-env": "7.1.0",
     "@babel/register": "7.0.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "clj-kondo": "^2020.1.13",
+    "clj-kondo": "^2022.9.8",
     "jest": "^25.1.0",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",

src/quo2/components/avatars/channel_avatar.cljs

@@ -7,7 +7,7 @@
 
 (defn channel-avatar [{:keys [big? lock-status emoji-background-color emoji]}]
   (let [locked?      (= :locked lock-status)
-        lock-exists? (not= :none lock-status)
+        lock-exists? (and lock-status (not= :none lock-status))
         dark?        (theme/dark?)]
     [rn/view {:style {:width            (if big? 32 24)
                       :height           (if big? 32 24)
@@ -42,4 +42,4 @@
                               colors/neutral-50)
            :container-style {:width  16
                              :height 16}
-           :size            12}]])]]))
+           :size            12}]])]]))

src/quo2/components/avatars/group_avatar.cljs

@@ -1,6 +1,5 @@
 (ns quo2.components.avatars.group-avatar
   (:require [quo2.foundations.colors :as colors]
-            [quo.theme :as quo.theme]
             [quo2.components.icon :as icon]
             [quo.react-native :as rn]))
 
@@ -14,14 +13,16 @@
 
 (defn group-avatar [_]
   (fn [{:keys [color size override-theme]}]
-    (let [theme (or override-theme (quo.theme/get-theme))
+    (let [theme          (or override-theme (if (colors/dark?) :dark :light))
           container-size (get-in sizes [:container size])
-          icon-size (get-in sizes [:icon size])]
-      [rn/view {:width container-size
-                :height container-size
-                :align-items :center
-                :justify-content :center
-                :border-radius (/ container-size 2)
-                :background-color (colors/custom-color color theme)}
+          icon-size      (get-in sizes [:icon size])]
+      [rn/view {:width            container-size
+                :height           container-size
+                :align-items      :center
+                :justify-content  :center
+                :border-radius    (/ container-size 2)
+                :background-color (if (= theme :light)
+                                    (colors/custom-color color 50)
+                                    (colors/custom-color color 60))}
        [icon/icon :total-members {:size icon-size
                                   :color colors/white-opa-70}]])))