Update release branch 2.30.x (#20903)

Revisions from develop: - 59ceddb develop origin/develop fix(wallet): fix bridge transactions (#20902) - 99ccbc3 Cover wallet send events with tests Part 2 #20411 #20533 (#20721) - 8c2d539 Enabling WalletConnect feature flag (#20906) - 67c83b1 fix(wallet): remove edit routes button in bridging (#20874) - 11a84ba feat(wallet): disable complex routing (#20901) - 1f5bb57 chore(wallet): disable bridging on unsupported tokens (#20846) - 4586f80 Add toggle in advanced settings for mobile data - 55c620e fix: create password for small screen (#20645) - 525609f Wallet Activity: transactions are not sorted by time #20808 (#20862) - 9065395 chore(settings): Disable telemetry option (#20881) - d27ab75 fix_:display group message using the new ui (#20787) - c6a1db6 ci: enable split apks & build only for arm64-v8a (#20683) - 73777e0 Ensure keycard account can send transaction after upgrading from v1 to v2 #20552 (#20845) - a6d3fc3 [#20524] fix: the missed keypairs are shown in the key pair list screen (#20888) - a671c70 fix broken screen and navigation when syncing fails (#20887) - a45991b 🥅 Filter connected dapps based on testnet mode, reject proposals and requests gracefully (#20799) - 2e9fa22 feat: wallet router v2 (#20631) - 737d8c4 rename sub to fix error when requesting to join community (#20868) - 3aa7e10 Sync process is blocked on Enabled notifications screen (#20883) - c1d2d44 perf: Fix app freeze after login (#20729) - 0fed811 e2e: updated testnet switching and added one test into smoke - 53c35cb fix(wallet): Linear gradient exception on invalid colors for watched account cards (#20854) - be82365 chore(settings)_: Remove testnet toggle from legacy advanced settings (#20875) - eae8a65 feat(wallet)_: Add beta info box in activity tab (#20873) - fe54a25 fix: not clearing network & web3-wallet on logout (#20886) - 15a4219 Reject wallet-connect request by dragging the modal down (#20763) (#20836) - 2ffbdac WalletConnect show expired toast (#20857) - 402eb83 fix Issue with scrolling WalletConnect transaction on Android (#20867) - ff88049 Fix WalletConnect header alignment on Android (#20860) - cee2124 WalletConnect no internet edge-cases (#20826) - 60ad7c8 chore(tests): New match-strict? cljs.test directive (#20825) - 4989c92 fix_: Adding own address as saved addresses (#20839)
status-im · Jul 30, 2024 · 0f15c01 · 0f15c01
1 parent a1784c5
commit 0f15c01
Show file tree

Hide file tree

Showing 175 changed files with 2,982 additions and 2,306 deletions.
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
@@ -74,7 +74,8 @@
                 ;; https://github.com/borkdude/clj-kondo/issues/867
                 :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
                                                           number
-                                                          legacy.status-im.test-helpers/restore-app-db]}
+                                                          legacy.status-im.test-helpers/restore-app-db
+                                                          (cljs.test/is [match-strict?])]}
                 :unresolved-var                {:level :error}
                 :unsorted-required-namespaces  {:level :error}
                 :unused-alias                  {:level :warning}

diff --git a/.env b/.env
@@ -35,3 +35,4 @@ FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
+FLAG_WALLET_CONNECT_ENABLED=1
diff --git a/.env.e2e b/.env.e2e
@@ -38,3 +38,5 @@ SHOW_NOT_IMPLEMENTED_FEATURES=1
 DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
 DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
 ENABLE_ALERT_BANNER=0
+FLAG_WALLET_CONNECT_ENABLED=1
+MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
diff --git a/.env.jenkins b/.env.jenkins
@@ -36,3 +36,4 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
diff --git a/.env.nightly b/.env.nightly
@@ -23,3 +23,4 @@ DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
diff --git a/.env.release b/.env.release
@@ -19,3 +19,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
+FLAG_WALLET_CONNECT_ENABLED=1
diff --git a/Makefile b/Makefile
@@ -215,15 +215,13 @@ build-fdroid: ##@build Build release for F-Droid
 build-android: export BUILD_ENV ?= prod
 build-android: export BUILD_TYPE ?= nightly
 build-android: export ORG_GRADLE_PROJECT_versionCode ?= $(TMP_BUILD_NUMBER)
-build-android: export ANDROID_ABI_SPLIT ?= false
-build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
 build-android: ##@build Build unsigned Android APK
 	@scripts/build-android.sh
 
 release-android: export TARGET := keytool
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-release-unsigned.apk
+	@scripts/sign-android.sh result/app-arm64-v8a-release-unsigned.apk
 
 release-ios: export TARGET := ios
 release-ios: export IOS_STATUS_GO_TARGETS := ios/arm64

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -211,7 +211,7 @@ android {
             reset()
             enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
             include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk true
+            universalApk false
         }
     }
     signingConfigs {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -38,10 +38,10 @@ KEYSTORE_PASSWORD=password
 KEYSTORE_ALIAS=status
 KEYSTORE_KEY_PASSWORD=password
 
-# By default we build a mostly universal APK
-ANDROID_ABI_SPLIT=false
-# Some platforms are excluded though
-ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
+# Splitting by CPU Architecture produces smaller APKs.
+ANDROID_ABI_SPLIT=true
+# By default its better to only build apk for most recent devices.
+ANDROID_ABI_INCLUDE=arm64-v8a
 
 org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC
 

diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -72,11 +72,7 @@ pipeline {
         stage('Upload') {
           steps { script {
             def urls = apks.collect { s5cmd.upload(it) }
-            if (urls.size() > 1) { /* Return only the universal APK. */
-              env.PKG_URL = urls.find { it.contains('universal') }
-            } else { /* If no universal is available pick first. */
-              env.PKG_URL = urls.first()
-            }
+            env.PKG_URL = urls.first()
             jenkins.setBuildDesc(APK: env.PKG_URL)
           } }
         }

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 import groovy.json.JsonBuilder
 

diff --git a/ci/Jenkinsfile.e2e-nightly b/ci/Jenkinsfile.e2e-nightly
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

diff --git a/ci/tests/Jenkinsfile.e2e-nightly b/ci/tests/Jenkinsfile.e2e-nightly
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
 

diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
 

diff --git a/ci/tests/Jenkinsfile.e2e-upgrade b/ci/tests/Jenkinsfile.e2e-upgrade
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
 

diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
   agent { label 'macos' }

diff --git a/ci/tools/Jenkinsfile.nix-cache b/ci/tools/Jenkinsfile.nix-cache
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
   agent { label params.AGENT_LABEL }

diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/tools/Jenkinsfile.xcode-clean b/ci/tools/Jenkinsfile.xcode-clean
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.3'
 
 pipeline {
   agent {

diff --git a/nix/deps/clojure/deps.json b/nix/deps/clojure/deps.json
@@ -711,11 +711,11 @@
   },
 
   {
-    "path": "nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8",
+    "path": "nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "4c94bd510f0c18a20191e46dd6becedebc640bbd",
-      "sha256": "0wpla2hx0s4mda58ndyd8938zmnz1gyhgfr6pzfphy27xfbvsssl"
+      "sha1": "f0830a112cae8ee931a90d9f39214a0ed4d44150",
+      "sha256": "1rjcgqhms84xmnhs7sqcd3b2dpa37mmzgz2yz33yz2rdb9skl96g"
     }
   },
 

diff --git a/nix/deps/clojure/deps.list b/nix/deps/clojure/deps.list
@@ -77,7 +77,7 @@ 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/1.0.0/nrepl-1.0.0.jar
-nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
+nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar

diff --git a/nix/mobile/android/build.nix b/nix/mobile/android/build.nix
@@ -18,10 +18,10 @@
   buildUrl ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_buildUrl" null,
   statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
   # If APKs should be split based on architectures
-  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
+  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "true",
   # Android architectures to build for
   # Used to detect end-to-end builds
-  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
+  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "arm64-v8a",
 }:
 
 let

diff --git a/resources/images/ui2/syncing_devices@2x.png b/resources/images/ui2/syncing_devices@2x.png
diff --git a/resources/images/ui2/syncing_devices@3x.png b/resources/images/ui2/syncing_devices@3x.png
diff --git a/resources/images/ui2/syncing_wrong@2x.png b/resources/images/ui2/syncing_wrong@2x.png
diff --git a/resources/images/ui2/syncing_wrong@3x.png b/resources/images/ui2/syncing_wrong@3x.png
diff --git a/scripts/run-android.sh b/scripts/run-android.sh
@@ -13,7 +13,7 @@ export BUILD_TYPE=debug
 
 # Install the APK on running emulator or android device.
 installAndLaunchApp() {
-  adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  adb install -r ./result/app-arm64-v8a-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
   "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
   # connected android devices need this port to be exposed for metro
   adb reverse "tcp:${RCT_METRO_PORT}" "tcp:${RCT_METRO_PORT}"

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -19,7 +19,7 @@
                 [cider/piggieback "0.4.1"]
                 [org.slf4j/slf4j-nop "2.0.9"]
                 [re-frisk-remote "1.6.0"]
-                [nubank/matcher-combinators "3.8.8"]
+                [nubank/matcher-combinators "3.9.1"]
 
                 ;; Use the same version specified in the Nix dependency.
                 [clj-kondo/clj-kondo "2024.03.13"]

diff --git a/src/legacy/status_im/data_store/communities.cljs b/src/legacy/status_im/data_store/communities.cljs
@@ -1,8 +1,8 @@
 (ns legacy.status-im.data-store.communities
   (:require
     [clojure.set :as set]
-    [clojure.walk :as walk]
-    [status-im.constants :as constants]))
+    [status-im.constants :as constants]
+    [utils.transforms :as transforms]))
 
 (defn <-revealed-accounts-rpc
   [accounts]
@@ -22,19 +22,26 @@
   (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))
 
 (defn <-chats-rpc
-  [chats]
-  (reduce-kv (fn [acc k v]
-               (assoc acc
-                      (name k)
-                      (-> v
-                          (assoc :token-gated?                 (:tokenGated v)
-                                 :can-post?                    (:canPost v)
-                                 :can-view?                    (:canView v)
-                                 :hide-if-permissions-not-met? (:hideIfPermissionsNotMet v))
-                          (dissoc :canPost :tokenGated :canView :hideIfPermissionsNotMet)
-                          (update :members walk/stringify-keys))))
-             {}
-             chats))
+  "This transformation from RPC is optimized differently because there can be
+  thousands of members in all chats and we don't want to transform them from JS
+  to CLJS because they will only be used to list community members or community
+  chat members."
+  [chats-js]
+  (let [chat-key-fn (fn [k]
+                      (case k
+                        "tokenGated"              :token-gated?
+                        "canPost"                 :can-post?
+                        "can-view"                :can-view?
+                        "hideIfPermissionsNotMet" :hide-if-permissions-not-met?
+                        (keyword k)))
+        chat-val-fn (fn [k v]
+                      (if (= "members" k)
+                        v
+                        (transforms/js->clj v)))]
+    (transforms/<-js-map
+     chats-js
+     {:val-fn (fn [_ v]
+                (transforms/<-js-map v {:key-fn chat-key-fn :val-fn chat-val-fn}))})))
 
 (defn <-categories-rpc
   [categ]
@@ -48,49 +55,59 @@
   [token-permission]
   (= (:type token-permission) constants/community-token-permission-become-member))
 
+(defn- rename-community-key
+  [k]
+  (case k
+    "canRequestAccess"            :can-request-access?
+    "canManageUsers"              :can-manage-users?
+    "canDeleteMessageForEveryone" :can-delete-message-for-everyone?
+    ;; This flag is misleading based on its name alone
+    ;; because it should not be used to decide if the user
+    ;; is *allowed* to join. Allowance is based on token
+    ;; permissions. Still, the flag can be used to know
+    ;; whether or not the user will have to wait until an
+    ;; admin approves a join request.
+    "canJoin"                     :can-join?
+    "requestedToJoinAt"           :requested-to-join-at
+    "isMember"                    :is-member?
+    "outroMessage"                :outro-message
+    "adminSettings"               :admin-settings
+    "tokenPermissions"            :token-permissions
+    "communityTokensMetadata"     :tokens-metadata
+    "introMessage"                :intro-message
+    "muteTill"                    :muted-till
+    "lastOpenedAt"                :last-opened-at
+    "joinedAt"                    :joined-at
+    (keyword k)))
+
 (defn <-rpc
-  [c]
-  (-> c
-      (set/rename-keys
-       {:canRequestAccess            :can-request-access?
-        :canManageUsers              :can-manage-users?
-        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
-        ;; This flag is misleading based on its name alone
-        ;; because it should not be used to decide if the user
-        ;; is *allowed* to join. Allowance is based on token
-        ;; permissions. Still, the flag can be used to know
-        ;; whether or not the user will have to wait until an
-        ;; admin approves a join request.
-        :canJoin                     :can-join?
-        :requestedToJoinAt           :requested-to-join-at
-        :isMember                    :is-member?
-        :outroMessage                :outro-message
-        :adminSettings               :admin-settings
-        :tokenPermissions            :token-permissions
-        :communityTokensMetadata     :tokens-metadata
-        :introMessage                :intro-message
-        :muteTill                    :muted-till
-        :lastOpenedAt                :last-opened-at
-        :joinedAt                    :joined-at})
-      (update :admin-settings
-              set/rename-keys
-              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
-      (update :members walk/stringify-keys)
-      (update :chats <-chats-rpc)
-      (update :token-permissions seq)
-      (update :categories <-categories-rpc)
-      (assoc :role-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some role-permission?)))
-      (assoc :membership-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some membership-permission?)))
-      (assoc :token-images
-             (reduce (fn [acc {sym :symbol image :image}]
-                       (assoc acc sym image))
-                     {}
-                     (:communityTokensMetadata c)))))
+  [c-js]
+  (let [community (transforms/<-js-map
+                   c-js
+                   {:key-fn rename-community-key
+                    :val-fn (fn [k v]
+                              (case k
+                                "members" v
+                                "chats"   (<-chats-rpc v)
+                                (transforms/js->clj v)))})]
+    (-> community
+        (update :admin-settings
+                set/rename-keys
+                {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
+        (update :token-permissions seq)
+        (update :categories <-categories-rpc)
+        (assoc :role-permissions?
+               (->> community
+                    :tokenPermissions
+                    vals
+                    (some role-permission?)))
+        (assoc :membership-permissions?
+               (->> community
+                    :tokenPermissions
+                    vals
+                    (some membership-permission?)))
+        (assoc :token-images
+               (reduce (fn [acc {sym :symbol image :image}]
+                         (assoc acc sym image))
+                       {}
+                       (:communityTokensMetadata community))))))