WIP 2

.env

@@ -36,5 +36,3 @@ SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.e2e

@@ -40,5 +40,3 @@ ENABLE_ALERT_BANNER=0
 FLAG_WALLET_CONNECT_ENABLED=1
 MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.jenkins

@@ -37,5 +37,3 @@ TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.nightly

@@ -24,5 +24,3 @@ TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=1
-SENTRY_ENVIRONMENT=ci-nightly

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=error
+LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -21,5 +21,3 @@ TEST_NETWORKS_ENABLED=0
 STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=0
-SENTRY_ENABLED=1
-SENTRY_ENVIRONMENT=production

android/app/build.gradle

@@ -143,10 +143,6 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
     }
-    // Disable default lint checks to remove redundant lintVitalReportRelease task
-    lintOptions {
-        checkReleaseBuilds false
-    }
 
     // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
     externalNativeBuild {

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,7 +41,6 @@ pipeline {
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
-    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
   }
 
   stages {

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 import groovy.json.JsonBuilder
 
@@ -134,3 +134,4 @@ def updateBucketJSON(urls, fileName) {
   writeFile(file: filePath, text: contentJson)
   return s5cmd.upload(filePath)
 }
+

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,7 +41,6 @@ pipeline {
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
     BUNDLE_PATH = "${HOME}/.bundle"
-    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
   }
 
   stages {

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent { label params.AGENT_LABEL }
@@ -109,19 +109,10 @@ pipeline {
     stage('Upload') {
       steps { script {
         sshagent(credentials: ['nix-cache-ssh']) {
-          nix.shell(
+          nix.shell("""
-            """
               find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
-                -not -name "*.links" -and -not -name "*-status-mobile-*" \
+                -not -name '*.links' -and -not -name '*-status-mobile-*' \
-                -and -not -name "tmp-*" \
+                | xargs nix copy --to ${NIX_SSH_REMOTE}
-                -print0 | xargs -0 nix-store -qR | sort -u > "${WORKSPACE_TMP}"/store-paths.txt
-            """,
-            pure: false
-          )
-          nix.shell(
-            """
-              nix-store --export < "${WORKSPACE_TMP}"/store-paths.txt | \\
-                ssh ${env.NIX_SSHOPTS} ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST} ${env.NIX_STORE_CMD} --import
             """,
             pure: false
           )

ci/tools/Jenkinsfile.playstore-meta

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent { label 'linux' }

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent {

ios/Podfile.lock

@@ -920,7 +920,7 @@ PODS:
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - react-native-compat (2.17.3):
+  - react-native-compat (2.11.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1536,7 +1536,7 @@ SPEC CHECKSUMS:
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: b2b140d3d65077a1d5d26be62d9415f895592344
   react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
-  react-native-compat: fd639220cca206df6c74b95df56a1809d78ba5a3
+  react-native-compat: 3af9add14d349701306d3d052638435f6795ac2c
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679

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

@@ -35,11 +35,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         return File(pubDirectory, gethLogFileName)
     }
 
-    private fun getPreLoginLogFile(): File {
-        val pubDirectory = utils.getPublicStorageDirectory()
-        return File(pubDirectory, preLoginLogFileName)
-    }
-
     fun prepareLogsFile(context: Context): File? {
         val logFile = getGethLogFile()
 
@@ -161,7 +156,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         val statusLogFile = File(logsTempDir, statusLogFileName)
         val gethLogFile = getGethLogFile()
         val requestLogFile = getRequestLogFile()
-        val preLoginLogFile = getPreLoginLogFile()
 
         try {
             if (zipFile.exists() || zipFile.createNewFile()) {
@@ -181,9 +175,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
             if (requestLogFile.exists()) {
                 filesToZip.add(requestLogFile)
             }
-            if (preLoginLogFile.exists()) {
-                filesToZip.add(preLoginLogFile)
-            }
             val zipped = zip(filesToZip.toTypedArray(), zipFile, errorList)
             if (zipped && zipFile.exists()) {
                 zipFile.setReadable(true, false)
@@ -214,7 +205,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         private const val gethLogFileName = "geth.log"
         private const val statusLogFileName = "Status.log"
         private const val requestsLogFileName = "api.log"
-        private const val preLoginLogFileName = "pre_login.log"
         private const val logsZipFileName = "Status-debug-logs.zip"
     }
 }

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

@@ -108,15 +108,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
         )
     }
 
-    @ReactMethod
-    fun intendedPanic(message: String) {
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "IntendedPanic",
-            requestBody = message,
-            statusgoFunction = { Statusgo.intendedPanic(message) },
-        )
-    }
-
     @ReactMethod
     fun addCentralizedMetric(request: String, callback: Callback) {
         StatusBackendClient.executeStatusGoRequestWithCallback(

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

@@ -35,7 +35,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
 
     NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
     NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
-    NSURL *preLoginLogFile = [rootUrl URLByAppendingPathComponent:@"pre_login.log"];
 
     NSURL *requestsLogFile = [rootUrl URLByAppendingPathComponent:@"api.log"];
 
@@ -47,10 +46,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
     if ([fileManager fileExistsAtPath:requestsLogFile.path]) {
         [fileManager copyItemAtPath:requestsLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"api.log"].path error:nil];
     }
-    
-    if ([fileManager fileExistsAtPath:preLoginLogFile.path]) {
-        [fileManager copyItemAtPath:preLoginLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"pre_login.log"].path error:nil];
-    }
 
     [SSZipArchive createZipFileAtPath:zipFile.path withContentsOfDirectory:logsFolderName.path];
     [fileManager removeItemAtPath:logsFolderName.path error:nil];

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

@@ -109,17 +109,6 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
                                                callback:callback];
 }
 
-RCT_EXPORT_METHOD(intendedPanic:(NSString *)message) {
-#if DEBUG
-    NSLog(@"IntendedPanic() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequest:@"IntendedPanic"
-                                           body:message
-                               statusgoFunction:^NSString *{
-        return StatusgoIntendedPanic(message);
-    }];
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
     return [StatusBackendClient executeStatusGoRequestWithResult:@"Fleets"
                                                          body:@""

nix/deps/gradle/deps.json

@@ -8838,8 +8838,8 @@
     "repo": "https://jitpack.io",
     "files": {
       "reflow-animator-1.0.6.pom": {
-        "sha1": "d2c5089ae74a366676d9432c401e373b4895858e",
+        "sha1": "4fe3d33c764beebdc477d93a590f63dfa38a5f6b",
-        "sha256": "sha256-uanUNC0CwC2YnlQ4rpZBMdp+Is6UF36Y/Iwn6YLLHno="
+        "sha256": "sha256-MEINlM+8v6LDFGREWswamEl17l26xa4eQHeKPcxbSI8="
       },
       "reflow-animator-1.0.6.aar": {
         "sha1": "36074a3fcb77c2ba12bd2de7dde81441e0c7504f",
@@ -8898,20 +8898,20 @@
   },
 
   {
-    "path": "org/gradle/github-dependency-graph-gradle-plugin/1.3.2",
+    "path": "org/gradle/github-dependency-graph-gradle-plugin/1.3.1",
     "repo": "https://plugins.gradle.org/m2",
     "files": {
-      "github-dependency-graph-gradle-plugin-1.3.2.pom": {
+      "github-dependency-graph-gradle-plugin-1.3.1.pom": {
-        "sha1": "0740a44f4c99d3e2d9fbc2c89afcb195ec66dbdf",
+        "sha1": "5d95862731c88c1e9190fa27a7bd2ffe3ab549d7",
-        "sha256": "sha256-xaVDODswVgtoaoIAtgCELvnd8IAx8AYdJA+FE3a0Jxs="
+        "sha256": "sha256-Zk7PNeEBetpWAp4e2rN5A+zn0NDsG3G5kU62uPssiJo="
       },
-      "github-dependency-graph-gradle-plugin-1.3.2.jar": {
+      "github-dependency-graph-gradle-plugin-1.3.1.jar": {
-        "sha1": "ba3d0995475c6aa79048e865d7923bbed20f36a0",
+        "sha1": "c905642b753938ef0fa1cda1fc330fae1c4016aa",
-        "sha256": "sha256-VdNKG2xBu75P6hSlZaERE3ZxOSSwAaPMjD2EnGSejQA="
+        "sha256": "sha256-0uYWjgzaasT18c62W6IElG2jW1Oe+X0O/4dflT5E61k="
       },
-      "github-dependency-graph-gradle-plugin-1.3.2.module": {
+      "github-dependency-graph-gradle-plugin-1.3.1.module": {
-        "sha1": "879866cccedf304d8c484d3bb70eb6d699e9e118",
+        "sha1": "818778b46a93f8d60f11cfa83c7ecbb2481706d8",
-        "sha256": "sha256-nBqz4Xbqelt3YhEAEG9aPzYC0+2MBcM1M+1Ys5PumhQ="
+        "sha256": "sha256-agfZPNoTEZDEU5USp5slvtvCfm5OxZucX7XuZ9xugzU="
       }
     }
   },
@@ -9052,16 +9052,16 @@
   },
 
   {
-    "path": "commons-codec/commons-codec/1.18.0",
+    "path": "commons-codec/commons-codec/1.17.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "commons-codec-1.18.0.pom": {
+      "commons-codec-1.17.1.pom": {
-        "sha1": "2aa7395e4e4d63be2fd4439da7a01527235f76bf",
+        "sha1": "d187e2d50ab520895df0dcb9d88980ffea50bfa3",
-        "sha256": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4="
+        "sha256": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
       },
-      "commons-codec-1.18.0.jar": {
+      "commons-codec-1.17.1.jar": {
-        "sha1": "ee45d1cf6ec2cc2b809ff04b4dc7aec858e0df8f",
+        "sha1": "973638b7149d333563584137ebf13a691bb60579",
-        "sha256": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ="
+        "sha256": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM="
       }
     }
   },
@@ -9135,20 +9135,20 @@
   },
 
   {
-    "path": "commons-logging/commons-logging/1.3.5",
+    "path": "commons-logging/commons-logging/1.3.4",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "commons-logging-1.3.5.pom": {
+      "commons-logging-1.3.4.pom": {
-        "sha1": "378e7ead6461eabd50a97f6503d061cad0dcae9d",
+        "sha1": "e919eab34a66d31a9bbe15ddc563d7d2e6770826",
-        "sha256": "sha256-zPSjA0b1AnuUlqvVYpCsJtFZq/K+ZN8SZWEdyUALnWg="
+        "sha256": "sha256-1L2jSJKqzL9PrTP8MjqKqQfvnXmYRlnaJJRMCoa/CGU="
       },
-      "commons-logging-1.3.5-api.jar": {
+      "commons-logging-1.3.4-api.jar": {
-        "sha1": "2e234baf9b0fd82e4e2f0db3b9083900fbfe2f36",
+        "sha1": "de4050262dfa7522365a9e3c76ed8cf4683fcffa",
-        "sha256": "sha256-6WjRzl2r6cQzxHbTd+ZSJzD2FttdtdKO2sfEWMtVMdw="
+        "sha256": "sha256-X1zVkiUzQHDbaxctBaaFuEei+tY+WxjtAjqqpeErgh8="
       },
-      "commons-logging-1.3.5.jar": {
+      "commons-logging-1.3.4.jar": {
-        "sha1": "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1",
+        "sha1": "b9fc14968d63a8b8a8a2c1885fe3e90564239708",
-        "sha256": "sha256-bXp0TkAnZJ+7UIld+Ul9EJ+Yx2amNwYv6NLqu7MUC6Q="
+        "sha256": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY="
       }
     }
   },
@@ -11836,12 +11836,12 @@
   },
 
   {
-    "path": "com/google/code/gson/gson-parent/2.12.1",
+    "path": "com/google/code/gson/gson-parent/2.11.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "gson-parent-2.12.1.pom": {
+      "gson-parent-2.11.0.pom": {
-        "sha1": "660107b2e76095ef86bbd15c503afe11e5260bfb",
+        "sha1": "b32d3bc5c89c852efe4c176df6c3fdeccbe150ef",
-        "sha256": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E="
+        "sha256": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
       }
     }
   },
@@ -11967,24 +11967,24 @@
   },
 
   {
-    "path": "com/google/code/gson/gson/2.12.1",
+    "path": "com/google/code/gson/gson/2.11.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "gson-2.12.1.pom": {
+      "gson-2.11.0.pom": {
-        "sha1": "d2c3993ff96e5da39a57e5e0b695eda560949b57",
+        "sha1": "55796dd7cc329027df79e96c4e6631e3c02c93c5",
-        "sha256": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg="
+        "sha256": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
       },
-      "gson-2.12.1.buildinfo": {
+      "gson-2.11.0.buildinfo": {
-        "sha1": "c2e219d4a63eebf78ce409ee8303eb930248f486",
+        "sha1": "4d1c42ee3c07943d8e07fab98bf0491877b4c0c6",
-        "sha256": "sha256-fNm4d7ep72MLsQq/BeBRdEuam/9hzGJafTURb48yeuY="
+        "sha256": "sha256-d6O/J0uIwA+ieS0kkb+yLkeL3OUzOMUcMBHW7nDr0pI="
       },
-      "gson-2.12.1.buildinfo.asc": {
+      "gson-2.11.0.buildinfo.asc": {
-        "sha1": "01ba63402708ab4efbd2fa2f4dc5ee7f136b9479",
+        "sha1": "ba50162dd390a51e11a706d62ef9a5d120138337",
-        "sha256": "sha256-M+At44sk0y+mblm7UnhRzYzeO36NPGTpP3rTID/wJjU="
+        "sha256": "sha256-blLhhVcT0w8htC6V6rrqU+CZ3egMLBv5AgE76D+zGIY="
       },
-      "gson-2.12.1.jar": {
+      "gson-2.11.0.jar": {
-        "sha1": "4e773a317740b83b43cfc3d652962856041697cb",
+        "sha1": "527175ca6d81050b53bdd4c457a6d6e017626b0e",
-        "sha256": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w="
+        "sha256": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s="
       }
     }
   },
@@ -12199,6 +12199,21 @@
     }
   },
 
+  {
+    "path": "com/google/errorprone/error_prone_annotations/2.27.0",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "error_prone_annotations-2.27.0.pom": {
+        "sha1": "85103026aa50b0e4efafee8f486e3ecd9ebfde31",
+        "sha256": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
+      },
+      "error_prone_annotations-2.27.0.jar": {
+        "sha1": "91b2c29d8a6148b5e2e4930f070d4840e2e48e34",
+        "sha256": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU="
+      }
+    }
+  },
+
   {
     "path": "com/google/errorprone/error_prone_annotations/2.36.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -12335,6 +12350,17 @@
     }
   },
 
+  {
+    "path": "com/google/errorprone/error_prone_parent/2.27.0",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "error_prone_parent-2.27.0.pom": {
+        "sha1": "336f77abf2668b10cae4ab136ea0c8258875de00",
+        "sha256": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
+      }
+    }
+  },
+
   {
     "path": "com/google/errorprone/error_prone_parent/2.36.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -12535,27 +12561,27 @@
   },
 
   {
-    "path": "com/google/guava/guava-parent/33.4.0-jre",
+    "path": "com/google/guava/guava-parent/33.3.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-parent-33.4.0-jre.pom": {
+      "guava-parent-33.3.1-jre.pom": {
-        "sha1": "ee79b87abc4ef9b3591db13c59de368c7b03dc79",
+        "sha1": "94729a0ed1dc35f623edd13afa6c1c2fe9a15d7c",
-        "sha256": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc="
+        "sha256": "sha256-VUQdsn6Iad/v4FMFm99Hi9x+lVhWQr85HwAjNF/VYoc="
       }
     }
   },
 
   {
-    "path": "com/google/guava/guava-testlib/33.4.0-jre",
+    "path": "com/google/guava/guava-testlib/33.3.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-testlib-33.4.0-jre.pom": {
+      "guava-testlib-33.3.1-jre.pom": {
-        "sha1": "f92730965d606702deb41eca3afb47396b7a5c6a",
+        "sha1": "12fbde61e46674436b0ec48f9b54fbd5f78f8256",
-        "sha256": "sha256-p+EQNjDV99XYCN3NnbnVhLvVldRW2UxpHOwJDQ7qZ/A="
+        "sha256": "sha256-4n6bu2lrvSCUeAF1YUO9EazSCFBFSnEILoceA+27PSw="
       },
-      "guava-testlib-33.4.0-jre.jar": {
+      "guava-testlib-33.3.1-jre.jar": {
-        "sha1": "e849ea71846b5ca96387d543c7ac862f18fe2513",
+        "sha1": "a2eeefe29ae8a5b2b6d3a318295fa9a1925bdc61",
-        "sha256": "sha256-JF+agJa8uth2DSga3QKf4klh/pOZ3f6as3srsLCe7WI="
+        "sha256": "sha256-j943uKx8GbgmwhbfKvPXEd9JRb/baLPx5qHD9KUng1w="
       }
     }
   },
@@ -12741,20 +12767,20 @@
   },
 
   {
-    "path": "com/google/guava/guava/33.4.0-jre",
+    "path": "com/google/guava/guava/33.3.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-33.4.0-jre.pom": {
+      "guava-33.3.1-jre.pom": {
-        "sha1": "5c671f0be7aa66b15ed0ec2e1afb4ee99c8c78e8",
+        "sha1": "5a5628b34628748abcb73144a909ddbea2265ed9",
-        "sha256": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s="
+        "sha256": "sha256-MTtn/BPrOwY07acVoSKZcfXem4GIvCgHYoFbg6J18ZM="
       },
-      "guava-33.4.0-jre.jar": {
+      "guava-33.3.1-jre.jar": {
-        "sha1": "03fcc0a259f724c7de54a6a55ea7e26d3d5c0cac",
+        "sha1": "852f8b363da0111e819460021ca693cacca3e8db",
-        "sha256": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg="
+        "sha256": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA="
       },
-      "guava-33.4.0-jre.module": {
+      "guava-33.3.1-jre.module": {
-        "sha1": "edaf59b47aef1afba209dfafe1481ed86ff07f04",
+        "sha1": "c99293bbf166d01849489fc6f94a101f79072aa7",
-        "sha256": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk="
+        "sha256": "sha256-QYWMhHU/2WprfFESL8zvOVWMkcwIJk4IUGvPIODmNzM="
       }
     }
   },
@@ -12927,12 +12953,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-bom/4.30.0-RC1",
+    "path": "com/google/protobuf/protobuf-bom/4.29.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-bom-4.30.0-RC1.pom": {
+      "protobuf-bom-4.29.0.pom": {
-        "sha1": "da26e5286a508eb4c29c3294f34d2fb932916cce",
+        "sha1": "5542df7ac3708da8bf30756f4ee6d804d04b8c9b",
-        "sha256": "sha256-Gs5LZwG6EhofKfwcjoPgc9pKFKCgex2GkjeMwK+GDYM="
+        "sha256": "sha256-3L/Apl6DmDAE0HFOmL8NIGBwEUVbYhk5cowAkmvIyZk="
       }
     }
   },
@@ -13178,16 +13204,16 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-java/4.30.0-RC1",
+    "path": "com/google/protobuf/protobuf-java/4.29.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-java-4.30.0-RC1.pom": {
+      "protobuf-java-4.29.0.pom": {
-        "sha1": "9b1a4031569c7b624e2e7e0d7bb12fd752f37e39",
+        "sha1": "27c4abe9c47f4aed31cf7acff86853a05f7e85f0",
-        "sha256": "sha256-3A0yPW415z4X6ICF0obJblY2xk8N8WcLCULsC8MYass="
+        "sha256": "sha256-7cHftEVG5yel+sU/CQUGv6aN2DB65vEHbv+tVy+S16Q="
       },
-      "protobuf-java-4.30.0-RC1.jar": {
+      "protobuf-java-4.29.0.jar": {
-        "sha1": "fe024780d64bf9edeb16d33974fd06799758a9e5",
+        "sha1": "ffea90ab158435d68de76951857ef5f8b0f98365",
-        "sha256": "sha256-ywRRWEELxFcCkN+AagbwIbYvLB4m7X4dtlczp8PzXoU="
+        "sha256": "sha256-FpAYUevl6J/oiqrTwmhmNzaVvC4wYnu4kyhH4vX8LnY="
       }
     }
   },
@@ -13307,12 +13333,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-parent/4.30.0-RC1",
+    "path": "com/google/protobuf/protobuf-parent/4.29.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-parent-4.30.0-RC1.pom": {
+      "protobuf-parent-4.29.0.pom": {
-        "sha1": "bfd3c39ebcb48274c73c80b82a2925b26a2aea80",
+        "sha1": "c35e0844930aea715cc8f4335fee49223b1fe35c",
-        "sha256": "sha256-vBZlQhUkJXKX06FCuoKNYc5/hD86HDSonJ4agltkvxQ="
+        "sha256": "sha256-jU6O2nh45revZuPCtvWHE839P7bNsHGS3My2HN0uSTA="
       }
     }
   },
@@ -13626,20 +13652,20 @@
   },
 
   {
-    "path": "com/squareup/okio/okio-jvm/3.10.2",
+    "path": "com/squareup/okio/okio-jvm/3.9.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "okio-jvm-3.10.2.pom": {
+      "okio-jvm-3.9.1.pom": {
-        "sha1": "bf3c29f09bf646535ba5a72206280bd5d9631d90",
+        "sha1": "32a1fc013a444bd5d7c45346973c102d02dbeb1e",
-        "sha256": "sha256-AP000Iv0YxNiofVSLKpXyuKMosfpOS76My72Vs/anUM="
+        "sha256": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU="
       },
-      "okio-jvm-3.10.2.jar": {
+      "okio-jvm-3.9.1.jar": {
-        "sha1": "6a2cc3acd5a83e66075a2f6c5b0608b6043fa34c",
+        "sha1": "79696e3f4ff05d41ba2b3dc68adb5808a2e5dc53",
-        "sha256": "sha256-/Qp+dsZzHwDpILe8EcBdgjqTIEVDGt1Ujgld4CCmnt4="
+        "sha256": "sha256-/m/pE3j5v6ewjDhkgozkGABc8orMoS6IR+tlxWXDdQA="
       },
-      "okio-jvm-3.10.2.module": {
+      "okio-jvm-3.9.1.module": {
-        "sha1": "e1125ef565c7f5fd6fbf0f925188c81febe1d0ee",
+        "sha1": "470544322c29b112668d2018c05fd94107b05e26",
-        "sha256": "sha256-p4CkJMVx4odVASiuADMjVibf/iFsuNs7ICRkmWrZaPA="
+        "sha256": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs="
       }
     }
   },
@@ -13732,20 +13758,20 @@
   },
 
   {
-    "path": "com/squareup/okio/okio/3.10.2",
+    "path": "com/squareup/okio/okio/3.9.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "okio-3.10.2.pom": {
+      "okio-3.9.1.pom": {
-        "sha1": "3d4a51279ef5bc796682828afd74ef3ab54ad543",
+        "sha1": "1cd169f2bbe6215607a62447b9e4b64a125b5e56",
-        "sha256": "sha256-7lbAIUoPqfER2nExxVDo3ICvDL9WCVbBzNosZtdQa0E="
+        "sha256": "sha256-06DDd+epr8zbsCqrXgUNwhL/2pQNvUcOo5cSpDQt8I4="
       },
-      "okio-3.10.2.jar": {
+      "okio-3.9.1.jar": {
-        "sha1": "5117e7c820a89b5722cc37fc9152d54131d4cd36",
+        "sha1": "3f1067fc8f61b89e013ea121198c49c991d74cbb",
-        "sha256": "sha256-3iJdy5APSY2cdVGHpEx043V2vYk62pa4bbYRDiellRM="
+        "sha256": "sha256-mcjrvEmV8p3ViwXXVYP8yLlX2yHu64xdiXM/DTSVWJc="
       },
-      "okio-3.10.2.module": {
+      "okio-3.9.1.module": {
-        "sha1": "0e038c29ef477f04b63b0f29847815c52decf3be",
+        "sha1": "eaa18fe21ddaef8640880e11315ef39757fbc75f",
-        "sha256": "sha256-P94fn79yxsMm1eiktTL0/Z/aLdDLFEK8pODHl9FBI4c="
+        "sha256": "sha256-m5C0J0pa1gLdV01tS0iQNmOy3ppgufw0AiSCk9hD4SE="
       }
     }
   },
@@ -15233,16 +15259,16 @@
   },
 
   {
-    "path": "io/netty/netty-tcnative-classes/2.0.70.Final",
+    "path": "io/netty/netty-tcnative-classes/2.0.69.Final",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "netty-tcnative-classes-2.0.70.Final.pom": {
+      "netty-tcnative-classes-2.0.69.Final.pom": {
-        "sha1": "c1e1a8fdfb72675d90886ad28a6949529f798b1a",
+        "sha1": "ee65d639d3c5312a4b6369f0d59504ad0c8dfe0b",
-        "sha256": "sha256-QRtGiEv20l66H2RTU5HsWxCH6Rjg5T0iTkIgoE+zJnU="
+        "sha256": "sha256-WdoPlJ4r7on1cR6z4Mb9jPeRTmtwwAfza56waIJDAVw="
       },
-      "netty-tcnative-classes-2.0.70.Final.jar": {
+      "netty-tcnative-classes-2.0.69.Final.jar": {
-        "sha1": "5f75accc769e69f2e6c1e56ba3a08b6c4bcc25f8",
+        "sha1": "0f018f36b688bafabe4573af230a8b59cf3c0713",
-        "sha256": "sha256-p5wVeTE9StSKPswdAaJdoG0i1kScO8w2nCMYdJvPVbw="
+        "sha256": "sha256-C7woSMsJnrP29Ow2UBs2AOGChFfNpB1TMGh/YB7gS+8="
       }
     }
   },
@@ -15259,12 +15285,12 @@
   },
 
   {
-    "path": "io/netty/netty-tcnative-parent/2.0.70.Final",
+    "path": "io/netty/netty-tcnative-parent/2.0.69.Final",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "netty-tcnative-parent-2.0.70.Final.pom": {
+      "netty-tcnative-parent-2.0.69.Final.pom": {
-        "sha1": "b5573ffca02a2c092bdb0f7e5efb7da495523ea4",
+        "sha1": "ba3c1cc69d48f0196ee84ecd3c5157c52a987931",
-        "sha256": "sha256-gHWl5UlncBGgcXXZuNqWOli4hLMujhAbdeeBUhc/3DU="
+        "sha256": "sha256-KVMCcZZjdhDIlPMr2nBQk82HaDFcnxpXOVGnXxeGmvw="
       }
     }
   },
@@ -15742,16 +15768,16 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy-agent/1.15.11",
+    "path": "net/bytebuddy/byte-buddy-agent/1.15.4",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-agent-1.15.11.pom": {
+      "byte-buddy-agent-1.15.4.pom": {
-        "sha1": "4015ca3530951c4336155d578de83f0e6b900f8c",
+        "sha1": "9440b88e2dfa9fb64979d9150453e5535c45e7d3",
-        "sha256": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag="
+        "sha256": "sha256-UJEHS07O1v8WbjlDlHRk/0Lac5Y4BC34aDuj6MIJ51U="
       },
-      "byte-buddy-agent-1.15.11.jar": {
+      "byte-buddy-agent-1.15.4.jar": {
-        "sha1": "a38b16385e867f59a641330f0362ebe742788ed8",
+        "sha1": "58e850dde88f3cf20f41f659440bef33f6c4fe02",
-        "sha256": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU="
+        "sha256": "sha256-HXbe/RWaVkuct6lo0N6ic2e4tw6951qWjn7xkhvHXuQ="
       }
     }
   },
@@ -15778,6 +15804,17 @@
     }
   },
 
+  {
+    "path": "net/bytebuddy/byte-buddy-parent/1.15.4",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "byte-buddy-parent-1.15.4.pom": {
+        "sha1": "d8cc6c53d8cda7c416764d4e4a74183546e1e5a2",
+        "sha256": "sha256-lwLCIT4/23CHv9M0tjQ80F9EUIqT64+Uqn2mVKwftI8="
+      }
+    }
+  },
+
   {
     "path": "net/bytebuddy/byte-buddy-parent/1.15.10",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -15789,17 +15826,6 @@
     }
   },
 
-  {
-    "path": "net/bytebuddy/byte-buddy-parent/1.15.11",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "byte-buddy-parent-1.15.11.pom": {
-        "sha1": "80e27b5d9cf8ba40dfd0b8ee8f7915d7237aec6d",
-        "sha256": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
-      }
-    }
-  },
-
   {
     "path": "net/bytebuddy/byte-buddy/1.11.13",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -15830,6 +15856,21 @@
     }
   },
 
+  {
+    "path": "net/bytebuddy/byte-buddy/1.15.4",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "byte-buddy-1.15.4.pom": {
+        "sha1": "1bab74a93db543cc550920d0cd7d58d8734bda4d",
+        "sha256": "sha256-L7uet+1bcChb8EOXvnjcKoUdDcLnSGXYFJfGGomOIb0="
+      },
+      "byte-buddy-1.15.4.jar": {
+        "sha1": "e8bd42992701720649765383ff570f415190b83f",
+        "sha256": "sha256-Smg9g/8hnyDUTzXKMC2CHgxoQuP6j58e6RPrFvSc7Gw="
+      }
+    }
+  },
+
   {
     "path": "net/bytebuddy/byte-buddy/1.15.10",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -15845,21 +15886,6 @@
     }
   },
 
-  {
-    "path": "net/bytebuddy/byte-buddy/1.15.11",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "byte-buddy-1.15.11.pom": {
-        "sha1": "c625e547e59a502e99eba31c1a5b1c514e8c64f5",
-        "sha256": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
-      },
-      "byte-buddy-1.15.11.jar": {
-        "sha1": "f61886478e0f9ee4c21d09574736f0ff45e0a46c",
-        "sha256": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A="
-      }
-    }
-  },
-
   {
     "path": "net/java/dev/jna/jna-platform/5.6.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -16433,6 +16459,17 @@
     }
   },
 
+  {
+    "path": "org/apache/apache/32",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "apache-32.pom": {
+        "sha1": "2e08f841a6fbc946452701faaf5e39a17ac97ef3",
+        "sha256": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
+      }
+    }
+  },
+
   {
     "path": "org/apache/apache/33",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -16666,6 +16703,28 @@
     }
   },
 
+  {
+    "path": "org/apache/commons/commons-parent/71",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-71.pom": {
+        "sha1": "91d35791f5037779fb320d054ed09cb14925dc32",
+        "sha256": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
+      }
+    }
+  },
+
+  {
+    "path": "org/apache/commons/commons-parent/72",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-72.pom": {
+        "sha1": "cdfbaff82e756be4cb74d3f09b8fbf8f6b06c79d",
+        "sha256": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
+      }
+    }
+  },
+
   {
     "path": "org/apache/commons/commons-parent/78",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -16677,28 +16736,6 @@
     }
   },
 
-  {
-    "path": "org/apache/commons/commons-parent/79",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "commons-parent-79.pom": {
-        "sha1": "a2f13e0fa1f22588976e02c39b840653986ba685",
-        "sha256": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo="
-      }
-    }
-  },
-
-  {
-    "path": "org/apache/commons/commons-parent/81",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "commons-parent-81.pom": {
-        "sha1": "4a342190fb243a221636ac0e0b02d3eed07a9908",
-        "sha256": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
-      }
-    }
-  },
-
   {
     "path": "org/apache/httpcomponents/httpclient/4.1.1",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -17434,20 +17471,20 @@
   },
 
   {
-    "path": "org/checkerframework/checker-qual/3.49.0",
+    "path": "org/checkerframework/checker-qual/3.48.2",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "checker-qual-3.49.0.pom": {
+      "checker-qual-3.48.2.pom": {
-        "sha1": "d13e380978f7ccc023bfef031f9d664d52c3877e",
+        "sha1": "95acb8356a028eeb22171b7330f7bb78cf0f9506",
-        "sha256": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A="
+        "sha256": "sha256-Sk+LlzEYgyx4SrUIpzAJ2tAt5Nq/0dFJLWa45MC6HRE="
       },
-      "checker-qual-3.49.0.jar": {
+      "checker-qual-3.48.2.jar": {
-        "sha1": "54be36cb42c9b991c109e467e2bfa82af4cda44e",
+        "sha1": "2a4797df796b23026b8215545b0d2936bacc52af",
-        "sha256": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4="
+        "sha256": "sha256-ryPyDJlbL+3jWx66gRd6mmaUTsZ7jk3uGapMwLcQxrU="
       },
-      "checker-qual-3.49.0.module": {
+      "checker-qual-3.48.2.module": {
-        "sha1": "b6e4941f8d6af0d46a496f72d1b8944e0ed8fd5d",
+        "sha1": "cdf30d8d4b97e12fc85e65e1bd55210a1a084b10",
-        "sha256": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ="
+        "sha256": "sha256-D2RjlMmz5KL1aitsZ6C0NAkqxrq3pJvC/wGtjKf08NU="
       }
     }
   },
@@ -19864,16 +19901,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.1.20-Beta2",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.1.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-reflect-2.1.20-Beta2.pom": {
+      "kotlin-reflect-2.1.0.pom": {
-        "sha1": "1f22f7def1b72d86f0122e94963556693dcd9054",
+        "sha1": "6c72cb76dbf12249eec091d5a7d6ea27a27fcc87",
-        "sha256": "sha256-TSmv4VZwoDfXO+C2ohrnzhcbhR5hQPWOERDtz2j/Djo="
+        "sha256": "sha256-nNhLPU9xfJYjXkujtydolcz/1V3kEcfOCz97q1Yu/kI="
       },
-      "kotlin-reflect-2.1.20-Beta2.jar": {
+      "kotlin-reflect-2.1.0.jar": {
-        "sha1": "9747e5ae1b3b47d83f7a810fbdd603c90cd5b0ad",
+        "sha1": "dc3753b59b67d79b7d2f546d51e22a0ec1f082d8",
-        "sha256": "sha256-MsWsLXYMzUpOX6IMg2JMSqx4DN7upMURajx3sgHgs4E="
+        "sha256": "sha256-tfYI7fqYqM+iNyzBLRitqXS+HFbBCT7/BswGH0/AiLI="
       }
     }
   },
@@ -21514,6 +21551,33 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.25",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-1.9.25.pom": {
+        "sha1": "cd80842137758a376e09fd243351e10abb0fa13c",
+        "sha256": "sha256-fcMxikdte5AtDSevm1b2Y+jMQmOi0zrQUMertlpbZ6E="
+      },
+      "kotlin-stdlib-1.9.25-all.jar": {
+        "sha1": "6c69e7b26179394dafd3c90e630ef763b8c1a267",
+        "sha256": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ="
+      },
+      "kotlin-stdlib-1.9.25-common.jar": {
+        "sha1": "4c7276a1529397ee6389483a408c57a9c6d4ca7d",
+        "sha256": "sha256-zBF0wWk6JC3Wy8gWpSfEU+BBhJTjbFDNxleL9AFxrNs="
+      },
+      "kotlin-stdlib-1.9.25.jar": {
+        "sha1": "f700a2f2b8f0d6d0fde48f56d894dc722fb029d7",
+        "sha256": "sha256-+c3Nv/H13oU4CuUml35oNybCqkLbHtbm5Qronklulf0="
+      },
+      "kotlin-stdlib-1.9.25.module": {
+        "sha1": "b36cccb05e35f533bf4a44ce7ba25dca4d356a2b",
+        "sha256": "sha256-Q+BqZsO3XKPkxcswSWjqg1ImJHuj9WExK9Gepi3oRqc="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib/2.1.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -21537,29 +21601,6 @@
     }
   },
 
-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.1.20-Beta2",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-2.1.20-Beta2.pom": {
-        "sha1": "4f06272e28b5e94f321d4f5e999110a95d93ea05",
-        "sha256": "sha256-MO2EkKrOoo71CWbghKGSZ/P1JqCL87tkkKUHe7fIgn4="
-      },
-      "kotlin-stdlib-2.1.20-Beta2-all.jar": {
-        "sha1": "919751264e79f13e6ec79f4eef1d5222e6520d31",
-        "sha256": "sha256-geB9406Esp4U8/3vkC9LxM8dXalZuGffaD++HMVM4eE="
-      },
-      "kotlin-stdlib-2.1.20-Beta2.jar": {
-        "sha1": "98e06078584a3b816315d9baee83d04022f3271c",
-        "sha256": "sha256-dDREYP6u8bxGO6aeUtUOfbAEn3E4uECxzz+yKom8/Vk="
-      },
-      "kotlin-stdlib-2.1.20-Beta2.module": {
-        "sha1": "42afc0b12293bb6474c45f25c4da99ae6fb16103",
-        "sha256": "sha256-SnA8ORhx/5f6h1qdImY6A3werSKT5SZ+CDK7U2pMHrY="
-      }
-    }
-  },
-
   {
     "path": "org/jetbrains/kotlin/kotlin-tooling-core/1.8.0",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -21760,16 +21801,16 @@
   },
 
   {
-    "path": "org/json/json/20250107",
+    "path": "org/json/json/20240303",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "json-20250107.pom": {
+      "json-20240303.pom": {
-        "sha1": "91b62e77c1b5a92b6dc79f8c0c154311e1477c85",
+        "sha1": "78c0fa2a26888461731e26603ef4b19cc53239ca",
-        "sha256": "sha256-ph+87jbeXMAb7ZMEYseLwEvBZBCwHZtfEABq8UoRvFY="
+        "sha256": "sha256-mUuvXYm/TKpc6WjkxOqxNcj5eD7PTSt7Dp0cik3fHk8="
       },
-      "json-20250107.jar": {
+      "json-20240303.jar": {
-        "sha1": "a1b5f0b5a1ce018b93a691c57ffc7d141b3a10f1",
+        "sha1": "0ebb88e8fb5122b7506d5cf1d69f1ccdb790d22a",
-        "sha256": "sha256-hdTBqxktMRf9Asf/8ewP5jreRc9W3vf+lQ7wYM8G6Z8="
+        "sha256": "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="
       }
     }
   },
@@ -21809,16 +21850,16 @@
   },
 
   {
-    "path": "org/junit/junit-bom/5.12.0-RC2",
+    "path": "org/junit/junit-bom/5.11.3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "junit-bom-5.12.0-RC2.pom": {
+      "junit-bom-5.11.3.pom": {
-        "sha1": "f7f31a9a73bd214137a5e22c45da37aa8fa893a1",
+        "sha1": "ff35120d66bcbdd05c8b94b57b08b9d30f15c343",
-        "sha256": "sha256-9H9ulor+J1iVBQAkFvwfbn78IHHc1HMNSDTUUp/XY+E="
+        "sha256": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q="
       },
-      "junit-bom-5.12.0-RC2.module": {
+      "junit-bom-5.11.3.module": {
-        "sha1": "49aa327f7c618b489654a7ac980a5647adf95be4",
+        "sha1": "cbe8d3c987c55bc57869f232f052c0df0042c32b",
-        "sha256": "sha256-5S09WIMqPhrcc3ky5x9gjbj5lefgLRpDmNjdhKDH/2o="
+        "sha256": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A="
       }
     }
   },
@@ -21914,16 +21955,16 @@
   },
 
   {
-    "path": "org/mockito/mockito-core/5.15.2",
+    "path": "org/mockito/mockito-core/5.14.2",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "mockito-core-5.15.2.pom": {
+      "mockito-core-5.14.2.pom": {
-        "sha1": "199967c4a9531dd9b29ed2ef72fc4b427192466c",
+        "sha1": "2f6476e2e7da6a275ebac685ed983d3f7bee84e3",
-        "sha256": "sha256-/tgS0qLznJhHSyoUxjxl+PRxeDtggtyGfAwbYFPGlIA="
+        "sha256": "sha256-Y45Wpo9JaHm8ig9Tz735xMw5pFtuQ4ozOl6oPAnunP0="
       },
-      "mockito-core-5.15.2.jar": {
+      "mockito-core-5.14.2.jar": {
-        "sha1": "87be4b1e0cc5febc07ab3197a8ff3ede56b37a79",
+        "sha1": "f7bf936008d7664e2002c3faf0c02071c8d10e7c",
-        "sha256": "sha256-v0i3Ny2UkdXsiuu0zdGH0VZjkxWZwPvnQQFmzg4eWP8="
+        "sha256": "sha256-IpYUHB4fLhrjXAjTapq0Vj7NZuA1M/6CYwp2TnqkkYI="
       }
     }
   },

nix/deps/gradle/deps.list

@@ -807,7 +807,7 @@ org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
 org.gradle.toolchains:foojay-resolver:0.5.0
-org.gradle:github-dependency-graph-gradle-plugin:1.3.2
+org.gradle:github-dependency-graph-gradle-plugin:1.3.1
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.2
 org.jacoco:org.jacoco.core:0.7.4.201502262128
@@ -1021,5 +1021,5 @@ xml-apis:xml-apis:1.4.01
 org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
 com.android.tools.build:gradle:3.5.4
-com.facebook.react:hermes-android:0.73.5
 com.android.tools.lint:lint-gradle:31.1.1
+com.facebook.react:hermes-android:0.73.5

nix/deps/gradle/deps.urls

@@ -552,7 +552,7 @@ https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animat
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
 https://jitpack.io/com/github/zacharee/AndroidPdfViewer/4.0.1/AndroidPdfViewer-4.0.1.pom
 https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
-https://plugins.gradle.org/m2/org/gradle/github-dependency-graph-gradle-plugin/1.3.2/github-dependency-graph-gradle-plugin-1.3.2.pom
+https://plugins.gradle.org/m2/org/gradle/github-dependency-graph-gradle-plugin/1.3.1/github-dependency-graph-gradle-plugin-1.3.1.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver-convention/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.5.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver/0.5.0/foojay-resolver-0.5.0.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
@@ -562,12 +562,12 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-cod
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
-https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.18.0/commons-codec-1.18.0.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.18.0/commons-io-2.18.0.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.5/commons-logging-1.3.5.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.4/commons-logging-1.3.4.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -726,7 +726,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.5/gson
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.6/gson-parent-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.9/gson-parent-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.9.1/gson-parent-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.12.1/gson-parent-2.12.1.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.11.0/gson-parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.2.4.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
@@ -735,7 +735,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.12.1/gson-2.12.1.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.7.0/tink-1.7.0.pom
 https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.28.3/dagger-2.28.3.pom
@@ -750,6 +750,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
@@ -762,6 +763,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.36.0/error_prone_parent-2.36.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
@@ -779,8 +781,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.4.0-jre/guava-parent-33.4.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-jre/guava-parent-33.3.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.4.0-jre/guava-testlib-33.4.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.1-jre/guava-testlib-33.3.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -793,7 +795,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.4.0-jre/guava-33.4.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.1-jre/guava-33.3.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -807,7 +809,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.30.0-RC1/protobuf-bom-4.30.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.29.0/protobuf-bom-4.29.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -824,7 +826,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.30.0-RC1/protobuf-java-4.30.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.29.0/protobuf-java-4.29.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -835,7 +837,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.30.0-RC1/protobuf-parent-4.30.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.29.0/protobuf-parent-4.29.0.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -856,13 +858,13 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.10.2/okio-jvm-3.10.2.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.10.2/okio-3.10.2.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.1/okio-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -969,9 +971,9 @@ https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.52.Final/netty-
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/5.0.0.Alpha2/netty-resolver-5.0.0.Alpha2.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.70.Final/netty-tcnative-classes-2.0.70.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.69.Final/netty-tcnative-classes-2.0.69.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.46.Final/netty-tcnative-parent-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.70.Final/netty-tcnative-parent-2.0.70.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.69.Final/netty-tcnative-parent-2.0.69.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.34.Final/netty-transport-4.1.34.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.52.Final/netty-transport-4.1.52.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.pom
@@ -1004,15 +1006,15 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.11/byte-buddy-agent-1.15.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.4/byte-buddy-agent-1.15.4.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.4/byte-buddy-parent-1.15.4.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.10/byte-buddy-parent-1.15.10.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.11/byte-buddy-parent-1.15.11.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.4/byte-buddy-1.15.4.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.10/byte-buddy-1.15.10.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.11/byte-buddy-1.15.11.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1056,6 +1058,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
@@ -1075,9 +1078,9 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/78/commons-parent-78.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/79/commons-parent-79.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/81/commons-parent-81.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1132,7 +1135,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.49.0/checker-qual-3.49.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.48.2/checker-qual-3.48.2.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1282,7 +1285,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.20-Beta2/kotlin-reflect-2.1.20-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.0/kotlin-reflect-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.9.0/kotlin-scripting-common-1.9.0.pom
@@ -1391,8 +1394,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.22/kotlin-stdlib-1.9.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.25/kotlin-stdlib-1.9.25.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.0/kotlin-stdlib-2.1.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.20-Beta2/kotlin-stdlib-2.1.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
@@ -1406,17 +1409,17 @@ https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-j
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
-https://repo.maven.apache.org/maven2/org/json/json/20250107/json-20250107.pom
+https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.12.0-RC2/junit-bom-5.12.0-RC2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.3/junit-bom-5.11.3.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.15.2/mockito-core-5.15.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom

nix/deps/gradle/deps_hack.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Fallback versions for each dependency
-readonly FOOJAY_FALLBACK="0.5.0"
-readonly KOTLIN_FALLBACK="1.8.0"
-readonly TOOLS_FALLBACK="3.5.4"
-readonly HERMES_FALLBACK="0.73.5"
-readonly GRADLE_LINT_FALLBACK="31.1.1"
-
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-cd "${GIT_ROOT}"
-
-get_version() {
-    local file="$1"
-    local pattern="$2"
-    local fallback="$3"
-    local version
-
-    if [[ ! -f "$file" ]]; then
-        echo "$fallback"
-        return 0
-    fi
-
-    version=$(grep "$pattern" "$file" 2>/dev/null | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.*[0-9]*" | tail -n1 || echo "$fallback")
-    echo "$version"
-}
-
-# https://github.com/googlesamples/android-custom-lint-rules/blob/be672cd747ecf13844918e1afccadb935f856a72/docs/api-guide/example.md.html#L112-L129
-get_gradle_lint_version() {
-  gradlePluginVersion=$(get_version "./nix/pkgs/aapt2/default.nix" "version =" $GRADLE_LINT_FALLBACK)
-  major=$(echo "$gradlePluginVersion" | grep -o "^[0-9]*")
-  #  lintVersion = gradlePluginVersion + 23.0.0
-  major=$((major + 23))
-  minor=$(echo "$gradlePluginVersion" | grep -o "\.[0-9]*\." | grep -o "[0-9]*")
-  patch=$(echo "$gradlePluginVersion" | grep -o "[0-9]*$")
-
-  echo "$major.$minor.$patch"
-}
-
-foojay_version=$(get_version "./node_modules/@react-native/gradle-plugin/settings.gradle.kts" "foojay.*version" "$FOOJAY_FALLBACK")
-kotlin_version=$(get_version "./node_modules/@react-native/gradle-plugin/gradle/libs.versions.toml" "kotlin =" "$KOTLIN_FALLBACK")
-tools_version=$(get_version "./patches/BlurView-build.gradle.patch" "gradle:" "$TOOLS_FALLBACK")
-hermes_version=$(get_version "./node_modules/react-native/ReactAndroid/gradle.properties" "VERSION_NAME" "$HERMES_FALLBACK")
-lint_version=$(get_gradle_lint_version)
-
-cat << EOF
-org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:$foojay_version
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlin_version
-com.android.tools.build:gradle:$tools_version
-com.facebook.react:hermes-android:$hermes_version
-com.android.tools.lint:lint-gradle:$lint_version
-EOF

nix/deps/gradle/generate.sh

@@ -38,10 +38,16 @@ function gen_deps_list() {
     echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_LIST}")${RST} direct dependencies..."
 }
 
-# FIXME: Fix for missing packages.
+# FIXME: Temporary fix for missing packages.
 # https://github.com/status-im/status-mobile/issues/15447
 function add_deps_hack() {
-   "${CUR_DIR}/deps_hack.sh" >> "${DEPS_LIST}"
+    echo -n \
+'org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+com.android.tools.build:gradle:3.5.4
+com.android.tools.lint:lint-gradle:31.1.1
+com.facebook.react:hermes-android:0.73.5' \
+        >> "${DEPS_LIST}"
 }
 
 # Find download URLs for each dependency.

nix/deps/gradle/get_deps.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # This script generates a list of dependencies for the main project and its
-# sub-projects defined using Gradle config files. It uses github-dependency-graph-gradle-plugin:
+# sub-projects defined using Gradle config files. It parses Gradle output of
-# https://github.com/gradle/github-dependency-graph-gradle-plugin?tab=readme-ov-file#using-the-plugin-to-generate-dependency-reports
+# 'dependencies' and 'buildEnvironment` tasks using AWK.
 
 set -Eeuo pipefail
 

nix/mobile/android/build.nix

@@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  buildInputs = with pkgs; [ nodejs openjdk_headless ];
+  buildInputs = with pkgs; [ nodejs openjdk ];
   nativeBuildInputs = with pkgs; [ bash gradle unzip ]
     ++ lib.optionals stdenv.isDarwin [ file gnumake ];
 

nix/mobile/android/default.nix

@@ -8,7 +8,7 @@ rec {
 
   shell = mkShell {
     buildInputs = with pkgs; [
-      openjdk_headless
+      openjdk
       gradle
       lsof  # used in start-react-native.sh
       flock # used in nix/scripts/node_modules.sh

nix/mobile/jsbundle/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation {
           ];
         };
     };
-  buildInputs = with pkgs; [ clojure nodejs bash git openjdk_headless ];
+  buildInputs = with pkgs; [ clojure nodejs bash git openjdk];
   phases = [
     "unpackPhase" "secretsPhase" "patchPhase"
     "configurePhase" "buildPhase" "installPhase"

nix/overlay.nix

@@ -49,18 +49,29 @@ in {
   nodejs = super.nodejs_20;
   ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs_20; };
-  openjdk_headless = super.openjdk17_headless;
+  openjdk = super.openjdk17_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
     versions = ["16.0" "16.1" "16.2"];
   };
-  go = super.go_1_22;
+  go = super.go_1_21;
   clang = super.clang_15;
-  buildGoPackage = super.buildGo122Package;
+  buildGoPackage = super.buildGo121Package;
-  buildGoModule = super.buildGo122Module;
+  buildGoModule = super.buildGo121Module;
-  gomobile = callPackage ./pkgs/gomobile {
+  gomobile = (super.gomobile.overrideAttrs (old: {
-    #FIXME: No Android SDK packages for aarch64-darwin.
+    patches = [
-    androidPkgs = self.androidEnvCustom.compose;
+      (self.fetchurl { # https://github.com/golang/mobile/pull/84
+        url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+        sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+      })
+      (self.fetchurl { # https://github.com/golang/go/issues/58426
+        url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
+        sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
+      })
+    ];
+  })).override {
+    # FIXME: No Android SDK packages for aarch64-darwin.
     withAndroidPkgs = stdenv.system != "aarch64-darwin";
+    androidPkgs = self.androidEnvCustom.compose;
   };
 
   # Android environment

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,6 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  # also referenced in nix/deps/gradle/deps_hack.sh
   version = "8.1.1-10154469";
 
   pkgPath = "com/android/tools/build/aapt2";

nix/pkgs/android-sdk/shell.nix

@@ -1,8 +1,8 @@
-{ mkShell, openjdk_headless, androidPkgs }:
+{ mkShell, openjdk, androidPkgs }:
 
 mkShell {
   name = "android-sdk-shell";
-  buildInputs = [ openjdk_headless ];
+  buildInputs = [ openjdk ];
 
   shellHook = ''
     export ANDROID_HOME="${androidPkgs.sdk}"

nix/pkgs/gomobile/default.nix

@@ -1,85 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchgit,
-  fetchurl,
-  buildGo122Module,
-  zlib,
-  makeWrapper,
-  xcodeenv,
-  androidenv,
-  xcodeWrapperArgs ? { },
-  xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs,
-  withAndroidPkgs ? stdenv.system != "aarch64-darwin",
-  androidPkgs ? (
-    androidenv.composeAndroidPackages {
-      includeNDK = true;
-    }
-  ),
-}:
-buildGo122Module {
-  pname = "gomobile";
-  version = "0-unstable-2024-12-13";
-
-  src = fetchgit {
-    name = "gomobile";
-    url = "https://go.googlesource.com/mobile";
-    rev = "a87c1cf6cf463f0d4476cfe0fcf67c2953d76e7c";
-    hash = "sha256-7j4rdmCZMC8tn4vAsC9x/mMNkom/+Tl7uAY+5gkSvfY=";
-  };
-
-  vendorHash = "sha256-6ycxEDEE0/i6Lxo0gb8wq3U2U7Q49AJj+PdzSl57wwI=";
-
-  CGO_ENABLED = "1";
-
-  subPackages = [
-    "bind"
-    "cmd/gobind"
-    "cmd/gomobile"
-  ];
-
-  # Fails with: go: cannot find GOROOT directory
-  doCheck = false;
-
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ];
-
-  # Prevent a non-deterministic temporary directory from polluting the resulting object files
-  postPatch = ''
-    substituteInPlace cmd/gomobile/env.go --replace-quiet \
-      'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \
-      'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")'
-    substituteInPlace cmd/gomobile/init.go --replace-quiet \
-      'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \
-      'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")'
-
-    # To fix unable to import bind: no Go package in golang.org/x/mobile/bind
-    substituteInPlace cmd/gomobile/init.go --replace \
-      'golang.org/x/mobile/cmd/gobind@latest' \
-      'golang.org/x/mobile/cmd/gobind'
-  '';
-
-  # Necessary for GOPATH when using gomobile.
-  postInstall = ''
-    mkdir -p $out/src/golang.org/x
-    ln -s $src $out/src/golang.org/x/mobile
-  '';
-
-  postFixup = ''
-    for prog in gomobile gobind; do
-      wrapProgram $out/bin/$prog \
-        --suffix GOPATH : $out \
-        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
-        ${lib.optionalString withAndroidPkgs ''
-          --prefix PATH : "${androidPkgs.androidsdk}/bin" \
-          --set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
-        ''}
-    done
-  '';
-
-  meta = {
-    description = "Tool for building and running mobile apps written in Go";
-    homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
-    license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ jakubgs ];
-  };
-}

nix/shells.nix

@@ -19,7 +19,7 @@ let
     # for calling clojure targets in CI or Makefile
     clojure = mkShell {
       buildInputs = with pkgs; [
-        clojure flock maven openjdk_headless
+        clojure flock maven openjdk
         # lint specific utilities
         babashka clj-kondo clojure-lsp ripgrep zprint
       ];
@@ -61,7 +61,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk_headless apksigner ];
+      buildInputs = with pkgs; [ openjdk apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools

nix/status-go/mobile/build.nix

@@ -1,5 +1,5 @@
 { callPackage, lib, buildGoPackage, pkgs
-, androidPkgs, openjdk_headless, gomobile, xcodeWrapper, removeReferencesTo
+, androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , go-bindata, mockgen, protobuf3_20, protoc-gen-go
 , meta
 , source
@@ -32,7 +32,7 @@ in buildGoPackage rec {
   extraSrcPaths = [ gomobile ];
   nativeBuildInputs = [
     gomobile removeReferencesTo go-bindata mockgen protoc-gen-go protobuf3_20 fakeGit
-  ] ++ optional isAndroid openjdk_headless
+  ] ++ optional isAndroid openjdk
     ++ optional isIOS xcodeWrapper;
 
   ldflags = goBuildLdFlags;
@@ -48,10 +48,6 @@ in buildGoPackage rec {
   # TODO: try removing when go is upgraded to 1.22
   GODEBUG = "netdns=cgo+2";
 
-  # Sentry for status-go
-  SENTRY_CONTEXT_NAME = "status-mobile";
-  SENTRY_CONTEXT_VERSION = version;
-
   preBuild = ''
     echo 'Generate static files'
     pushd go/src/$goPackagePath

nix/status-go/source.nix

@@ -13,8 +13,8 @@ let
     repo = "status-go";
     rev = "unknown";
     shortRev = rev;
-    version = "unknown";
+    rawVersion = "develop";
-    cleanVersion = version;
+    cleanVersion = rawVersion;
     goPackagePath = "github.com/${owner}/${repo}";
     # We use builtins.path so that we can name the resulting derivation,
     # Normally the name would not be deterministic, taken from the checkout directory.
@@ -43,6 +43,7 @@ let
     inherit (versionJSON) owner repo version;
     rev = versionJSON.commit-sha1;
     shortRev = strings.substring 0 7 rev;
+    rawVersion = versionJSON.version;
     cleanVersion = lib.sanitizeVersion versionJSON.version;
     # Need to pretend this is from status-im to let Go build it.
     goPackagePath = "github.com/status-im/${repo}";

scripts/build-android.sh

@@ -45,9 +45,8 @@ SECRETS_ENV_VARS=(
     'INFURA_TOKEN_SECRET'
     'OPENSEA_API_KEY'
     'MIXPANEL_APP_ID'
-    'MIXPANEL_APP_TOKEN'
+    'MIXPANEL_TOKEN'
     'POKT_TOKEN'
-    'SENTRY_DSN_STATUS_GO'
 )
 
 # Secrets like this can't be passed via args or they end up in derivation.

shadow-cljs.edn

@@ -77,13 +77,8 @@
      #shadow/env "STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX"
      status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env
                                                            "STATUS_BACKEND_SERVER_ROOT_DATA_DIR"
-
-     ;; Uncomment this line during development if you want to test the integration with Sentry.
-     ;;
-     ;; status-im.config/SENTRY_DSN_STATUS_GO #shadow/env "SENTRY_DSN_STATUS_GO"
-
      status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_TOKEN"
+     status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN"
      status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
      status-im.config/RARIBLE_MAINNET_API_KEY #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY #shadow/env "RARIBLE_TESTNET_API_KEY"
@@ -94,11 +89,7 @@
      status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
      status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
      status-im.config/ALCHEMY_BASE_MAINNET_TOKEN #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"}
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_USER #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_USER"
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_PASSWORD #shadow/env
-                                                           "STATUS_BUILD_ETH_RPC_PROXY_PASSWORD"
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_URL #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_URL"}
     :compiler-options {:output-feature-set :es5
                        ;; We disable `:fn-deprecated` warnings because we
                        ;; are managing deprecation via clj-kondo and we
@@ -120,28 +111,23 @@
    :chunks {:fleets legacy.status-im.fleet.default-fleet/default-fleets}
    :release
    {:closure-defines
-    {status-im.config/POKT_TOKEN                          #shadow/env "POKT_TOKEN"
+    {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
-     status-im.config/INFURA_TOKEN                        #shadow/env "INFURA_TOKEN"
+     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
-     status-im.config/STATUS_BUILD_PROXY_USER             #shadow/env "STATUS_BUILD_PROXY_USER"
+     status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
-     status-im.config/STATUS_BUILD_PROXY_PASSWORD         #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
+     status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
-     status-im.config/SENTRY_DSN_STATUS_GO                #shadow/env "SENTRY_DSN_STATUS_GO"
+     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-     status-im.config/OPENSEA_API_KEY                     #shadow/env "OPENSEA_API_KEY"
+     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_APP_ID                     #shadow/env "MIXPANEL_APP_ID"
+     status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
-     status-im.config/MIXPANEL_APP_TOKEN                  #shadow/env "MIXPANEL_APP_TOKEN"
+     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
-     status-im.config/RARIBLE_MAINNET_API_KEY             #shadow/env "RARIBLE_MAINNET_API_KEY"
+     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
-     status-im.config/RARIBLE_TESTNET_API_KEY             #shadow/env "RARIBLE_TESTNET_API_KEY"
+     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN      #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN      #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+     status-im.config/ALCHEMY_BASE_MAINNET_TOKEN     #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_BASE_MAINNET_TOKEN          #shadow/env "ALCHEMY_BASE_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN     #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"}
-     status-im.config/ALCHEMY_BASE_SEPOLIA_TOKEN          #shadow/env "ALCHEMY_BASE_SEPOLIA_TOKEN"
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_USER     #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_USER"
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_PASSWORD #shadow/env
-                                                           "STATUS_BUILD_ETH_RPC_PROXY_PASSWORD"
-     status-im.config/STATUS_BUILD_ETH_RPC_PROXY_URL      #shadow/env "STATUS_BUILD_ETH_RPC_PROXY_URL"}
     :compiler-options {:output-feature-set :es6
                        ;;disable for android build as there
                        ;;is an intermittent warning with deftype
@@ -174,7 +160,7 @@
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-    status-im.config/MIXPANEL_APP_TOKEN             #shadow/env "MIXPANEL_APP_TOKEN"
+    status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"

src/legacy/status_im/log_level/core.cljs

@@ -2,41 +2,19 @@
   (:require
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [re-frame.core :as re-frame]
-    [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (rf/defn save-log-level
   {:events [:log-level.ui/change-log-level-confirmed]}
-  [{:keys [db]} log-level]
+  [{:keys [db] :as cofx} log-level]
   (let [old-log-level (get-in db [:profile/profile :log-level])]
     (when (not= old-log-level log-level)
-      (let [need-set-log-enabled? (or (empty? old-log-level) (empty? log-level))
+      (multiaccounts.update/multiaccount-update
-            log-enabled?          (boolean (seq log-level))
+       cofx
-            rpc-calls             (cond-> []
+       :log-level
-                                    log-enabled?
+       log-level
-                                    (conj {:method   "wakuext_setLogLevel"
+       {:on-success #(re-frame/dispatch [:profile/logout])}))))
-                                           :params   [{:logLevel log-level}]
-                                           :on-error #(log/error "Failed to set log level" %)})
-
-                                    need-set-log-enabled?
-                                    (conj {:method   "wakuext_setLogEnabled"
-                                           :params   [log-enabled?]
-                                           :on-error #(log/error "Failed to set log enabled" %)}))]
-        {:fx [[:json-rpc/call
-               (conj (vec (map #(assoc % :on-success nil) (butlast rpc-calls)))
-                     (assoc (last rpc-calls)
-                            :on-success
-                            #(rf/dispatch [:log-level/update-multiaccount log-level])))]]}))))
-
-(rf/defn update-multiaccount
-  {:events [:log-level/update-multiaccount]}
-  [cofx log-level]
-  (multiaccounts.update/multiaccount-update
-   cofx
-   :log-level
-   log-level
-   {:on-success #(rf/dispatch [:profile/logout])}))
 
 (rf/defn show-change-log-level-confirmation
   {:events [:log-level.ui/log-level-selected]}

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

@@ -1,13 +1,10 @@
 (ns legacy.status-im.ui.screens.advanced-settings.views
   (:require
-    [clojure.string :as string]
     [legacy.status-im.ui.components.core :as components]
     [legacy.status-im.ui.components.list.item :as list.item]
     [legacy.status-im.ui.components.list.views :as list]
     [quo.core :as quo]
     [re-frame.core :as re-frame]
-    [status-im.config :as config]
-    [status-im.feature-flags :as ff]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf])
   (:require-macros [legacy.status-im.utils.views :as views]))
@@ -20,16 +17,7 @@
            peer-syncing-enabled?]}]
   (keep
    identity
-   [(when (ff/enabled? ::ff/app-monitoring.intentional-crash)
+   [{:size :small
-      {:size                :small
-       :title               (str "Force crash immediately"
-                                 (when (string/blank? config/sentry-dsn-status-go)
-                                   " (Sentry DSN is not set)"))
-       :accessibility-label :intended-panic
-       :on-press            (fn []
-                              (re-frame/dispatch [:app-monitoring/intended-panic
-                                                  "status-mobile intentional panic"]))})
-    {:size :small
      :title (i18n/label :t/log-level)
      :accessibility-label :log-level-settings-button
      :on-press

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

@@ -33,9 +33,6 @@
         name]]]]))
 
 (def log-levels
-  "The status-go log library (zap) doesn't support the trace level, so we remove
-  the trace option from the UI. When trace is enabled an error will happen while
-  trying to login (user will see the error 'wrong password')."
   [{:name  "DISABLED"
     :value ""}
    {:name  "ERROR"
@@ -45,7 +42,9 @@
    {:name  "INFO"
     :value "INFO"}
    {:name  "DEBUG"
-    :value "DEBUG"}])
+    :value "DEBUG"}
+   {:name  "TRACE"
+    :value "TRACE"}])
 
 (views/defview log-level-settings
   []

src/native_module/core.cljs

@@ -569,7 +569,3 @@
    (.createAccountFromPrivateKey ^js (account-manager)
                                  (types/clj->json {:privateKey private-key})
                                  callback)))
-
-(defn intended-panic
-  [message]
-  (.intendedPanic ^js (status) message))

src/quo/components/blur/view.cljs

@@ -10,10 +10,11 @@
   ([{:keys [style]} child]
    (let [theme (quo.theme/use-theme)]
      [rn/view
-      {:style [style
+      {:style (assoc style
-               {:pointer-events   :box-none
+                     :pointer-events :box-none
-                :background-color (or (:background-color style)
+                     :background-color
-                                      (colors/theme-colors colors/white colors/neutral-80 theme))}]}
+                     (or (:background-color style)
+                         (colors/theme-colors colors/white colors/neutral-80 theme)))}
       child])))
 
 (def view (if platform/ios? blur/view view-android))

src/quo/components/buttons/button/style.cljs

@@ -56,63 +56,62 @@
                       24 8
                       12))})
 
-(defn container-styles
+(defn style-container
   [{:keys [size disabled? border-radius background-color border-color icon-only? icon-top
-           icon-left icon-right inner-style]}]
+           icon-left icon-right]}]
-  [{:height             size
+  (merge {:height             size
-    :align-items        :center
+          :align-items        :center
-    :justify-content    :center
+          :justify-content    :center
-    :flex-direction     (if icon-top :column :row)
+          :flex-direction     (if icon-top :column :row)
-    :padding-horizontal (when-not (or icon-only? icon-left icon-right)
+          :padding-horizontal (when-not (or icon-only? icon-left icon-right)
-                          (case size
+                                (case size
-                            56 (if border-color 10 11)
+                                  56 (if border-color 10 11)
-                            40 16
+                                  40 16
-                            32 12
+                                  32 12
-                            24 7
+                                  24 7
-                            16))
+                                  16))
-    :padding-left       (when-not (or icon-only? icon-left)
+          :padding-left       (when-not (or icon-only? icon-left)
-                          (case size
+                                (case size
-                            56 nil
+                                  56 nil
-                            40 16
+                                  40 16
-                            32 12
+                                  32 12
-                            24 8
+                                  24 8
-                            16))
+                                  16))
-    :padding-right      (when-not (or icon-only? icon-right)
+          :padding-right      (when-not (or icon-only? icon-right)
-                          (case size
+                                (case size
-                            56 nil
+                                  56 nil
-                            40 16
+                                  40 16
-                            32 12
+                                  32 12
-                            24 8
+                                  24 8
-                            16))
+                                  16))
-    :padding-top        (when-not (or icon-only? icon-left icon-right)
+          :padding-top        (when-not (or icon-only? icon-left icon-right)
-                          (case size
+                                (case size
-                            56 0
+                                  56 0
-                            40 (if border-color 8 9)
+                                  40 (if border-color 8 9)
-                            32 (if border-color 4 5)
+                                  32 (if border-color 4 5)
-                            24 0
+                                  24 0
-                            (if border-color 8 9)))
+                                  (if border-color 8 9)))
-    :padding-bottom     (when-not (or icon-only? icon-left icon-right)
+          :padding-bottom     (when-not (or icon-only? icon-left icon-right)
-                          (case size
+                                (case size
-                            56 0
+                                  56 0
-                            40 9
+                                  40 9
-                            32 5
+                                  32 5
-                            24 0
+                                  24 0
-                            9))
+                                  9))
-    :overflow           :hidden
+          :overflow           :hidden
-    :background-color   (if disabled? (colors/alpha background-color 0.3) background-color)
+          :background-color   (if disabled? (colors/alpha background-color 0.3) background-color)
-    :border-radius      (if border-radius
+          :border-radius      (if border-radius
-                          border-radius
+                                border-radius
-                          (case size
+                                (case size
-                            56 12
+                                  56 12
-                            40 12
+                                  40 12
-                            32 10
+                                  32 10
-                            24 8
+                                  24 8
-                            12))
+                                  12))
-    :border-color       border-color
+          :border-color       border-color
-    :border-width       (when border-color 1)}
+          :border-width       (when border-color 1)}
-   (when icon-only?
+         (when icon-only?
-     {:width size})
+           {:width size})
-   (when border-color
+         (when border-color
-     {:border-color border-color
+           {:border-color border-color
-      :border-width 1})
+            :border-width 1})))
-   inner-style])

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

@@ -62,9 +62,12 @@
       :on-press                on-press
       :allow-multiple-presses? allow-multiple-presses?
       :on-long-press           on-long-press
-      :style                   [(style/shape-style-container size border-radius) container-style]}
+      :style                   (merge
+                                (style/shape-style-container size border-radius)
+                                container-style)}
      [rn/view
-      {:style (style/container-styles {:size             size
+      {:style (merge
+               (style/style-container {:size             size
                                        :disabled?        disabled?
                                        :border-radius    border-radius
                                        :background-color background-color
@@ -72,8 +75,8 @@
                                        :icon-only?       icon-only?
                                        :icon-top         icon-top
                                        :icon-left        icon-left
-                                       :icon-right       icon-right
+                                       :icon-right       icon-right})
-                                       :inner-style      inner-style})}
+               inner-style)}
       (when overlay-customization-color
         [customization-colors/overlay
          {:customization-color overlay-customization-color

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

@@ -58,7 +58,7 @@
 
         :error
         [info-message/view
-         {:icon   :i/alert
+         {:icon   :i/info
           :size   :default
           :status :error}
          text]

src/quo/components/colors/color/style.cljs

@@ -30,8 +30,7 @@
      selected?   (assoc :border-top-color    (colors/alpha color 0.4)
                         :border-end-color    (colors/alpha color 0.4)
                         :border-bottom-color (colors/alpha color 0.2)
-                        :border-start-color  (colors/alpha color 0.2)
+                        :border-start-color  (colors/alpha color 0.2))
-                        :border-color        nil)
      (zero? idx) (assoc :margin-left -4))))
 
 (defn color-circle

src/quo/components/community/community_card_view.cljs

@@ -55,7 +55,7 @@
         [rn/view (style/card-view-chat-icon 48 theme)
          [icon/community-icon {:images images} 48]]
         (when (= status :gated)
-          [rn/view style/permission-tag-styles
+          [rn/view (style/permission-tag-styles)
            [community-view/permission-tag-container
             {:locked? locked?
              :status  status
@@ -63,12 +63,10 @@
         [community-view/community-title
          {:title       name
           :description description}]
-        [rn/view {:style style/card-stats-position}
+        [rn/view {:style (style/card-stats-position)}
          [community-view/community-stats-column
-          {:type                 :card-view
+          {:type :card-view}]]
-           :members-count        (:members-count community)
+        [rn/view {:style (style/community-tags-position)}
-           :active-members-count (:active-members-count community)}]]
-        [rn/view {:style style/community-tags-position}
          [community-view/community-tags {:tags tags}]]]]]]))
 
 (defn view

src/quo/components/community/community_list_view.cljs

@@ -60,7 +60,7 @@
              :style          {:border-radius 12
                               :margin-left   12}}
             props)
-     [rn/view (merge style/membership-info-container style)
+     [rn/view (merge (style/membership-info-container) style)
       [community-icon/community-icon
        {:images images} 32]
       [rn/view

src/quo/components/community/community_view.cljs

@@ -11,8 +11,11 @@
     [react-native.gesture :as gesture]))
 
 (defn community-stats-column
-  [{:keys [type members-count active-members-count]}]
+  [{:keys [type members-count active-count]}]
-  [rn/view (if (= type :card-view) style/card-stats-container style/list-stats-container)
+  [rn/view
+   (if (= type :card-view)
+     (style/card-stats-container)
+     (style/list-stats-container))
    [community-stat/view
     {:accessibility-label :stats-members-count
      :icon                :i/group
@@ -21,7 +24,7 @@
    [community-stat/view
     {:accessibility-label :stats-active-count
      :icon                :i/active-members
-     :value               active-members-count}]])
+     :value               active-count}]])
 
 (defn community-tags
   [{:keys [tags container-style last-item-style]}]

src/quo/components/community/style.cljs

@@ -17,20 +17,24 @@
 (def detail-container
   {:flex 1})
 
-(def card-stats-container
+(defn card-stats-container
+  []
   {:flex-direction :row})
 
-(def list-stats-container
+(defn list-stats-container
+  []
   {:flex-direction :row
    :align-items    :center})
 
-(def card-stats-position
+(defn card-stats-position
+  []
   {:position :absolute
    :top      116
    :right    12
    :left     12})
 
-(def community-tags-position
+(defn community-tags-position
+  []
   {:position :absolute
    :top      154
    :right    12
@@ -64,7 +68,8 @@
                       colors/neutral-90
                       theme)})
 
-(def membership-info-container
+(defn membership-info-container
+  []
   {:flex-direction :row
    :border-radius  16
    :align-items    :center
@@ -82,7 +87,8 @@
    :border-top-left-radius  20
    :background-color        colors/primary-50-opa-20})
 
-(def permission-tag-styles
+(defn permission-tag-styles
+  []
   {:position :absolute
    :top      8
    :right    8})
@@ -140,14 +146,10 @@
    :background-color   (colors/theme-colors colors/white colors/neutral-90 theme)})
 
 (def loading-tags-container
-  {:margin-top     20
+  {:margin-top 20 :flex-direction :row :align-items :center})
-   :flex-direction :row
-   :align-items    :center})
 
 (def loading-stats-container
-  {:margin-top     20
+  {:margin-top 20 :flex-direction :row :align-items :center})
-   :flex-direction :row
-   :align-items    :center})
 
 (defn loading-stat-circle
   [theme margin-left]

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

@@ -31,8 +31,7 @@
       [:scroll? {:optional true} [:maybe :boolean]]
       [:blur? {:optional true} [:maybe :boolean]]
       [:container-style {:optional true} [:maybe :map]]
-      [:buttons-container-style {:optional true} [:maybe :map]]
+      [:buttons-container-style {:optional true} [:maybe :map]]]]]
-      [:buttons-style {:optional true} [:maybe :map]]]]]
    :any])
 
 (def ^:private role-icon
@@ -44,9 +43,10 @@
 (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 scroll? container-style
-           buttons-container-style buttons-style context-tag-props]}]
+           buttons-container-style context-tag-props]}]
   (let [theme (quo.theme/use-theme)]
-    [rn/view {:style (merge (style/container scroll? blur? theme) container-style)}
+    [rn/view
+     {:style (merge (style/container scroll? blur? theme) container-style)}
      (when (= description :top-error)
        [rn/view {:style style/error-message}
         [icon/icon
@@ -82,7 +82,7 @@
         [button/button
          (merge
           {:size                40
-           :container-style     (merge style/button-container buttons-style)
+           :container-style     style/button-container
            :background          (when (or blur? scroll?) :blur)
            :theme               theme
            :accessibility-label :button-two}
@@ -91,7 +91,7 @@
       [button/button
        (merge
         {:size                40
-         :container-style     (merge style/button-container buttons-style)
+         :container-style     style/button-container
          :background          (when (or blur? scroll?) :blur)
          :theme               theme
          :accessibility-label :button-one}

src/quo/components/drawers/documentation_drawers/style.cljs

@@ -13,11 +13,11 @@
 
 (def content
   {:align-items   :flex-start
+   :margin-top    8
    :margin-bottom (+ (safe-area/get-bottom) 12)})
 
 (defn title
   [theme]
-  {:color         (colors/theme-colors colors/neutral-100
+  {:color (colors/theme-colors colors/neutral-100
-                                       colors/white
+                               colors/white
-                                       theme)
+                               theme)})
-   :margin-bottom 8})

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

@@ -24,13 +24,12 @@
       :always-bounce-vertical            false
       :content-inset-adjustment-behavior :never}
      [rn/view {:style style/container}
-      (when title
+      [text/text
-        [text/text
+       {:size                :heading-2
-         {:size                :heading-2
+        :accessibility-label :documentation-drawer-title
-          :accessibility-label :documentation-drawer-title
+        :style               (style/title theme)
-          :style               (style/title theme)
+        :weight              :semi-bold}
-          :weight              :semi-bold}
+       title]
-         title])
       [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
        content
        (when show-button?

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

@@ -57,10 +57,17 @@
        :container-style style/keycard-icon}])])
 
 (defn- account-subtitle
-  [{:keys [description]}]
+  [{:keys [networks theme blur? description]}]
-  [address-text/view
+  (if networks
-   {:address description
+    [address-text/view
-    :format  :short}])
+     {:networks networks
+      :address  description
+      :format   :short}]
+    [text/text
+     {:size   :paragraph-2
+      :weight :regular
+      :style  (style/description theme blur?)}
+     description]))
 
 (defn- default-keypair-subtitle
   [{:keys [description theme blur?]}]
@@ -102,7 +109,7 @@
    description])
 
 (defn- subtitle
-  [{:keys [type theme blur? stored description community-name community-logo
+  [{:keys [type theme blur? stored networks description community-name community-logo
            context-tag-type account-name emoji customization-color full-name profile-picture context
            icon]}]
   (cond
@@ -114,7 +121,8 @@
 
     (= :account type)
     [account-subtitle
-     {:theme       theme
+     {:networks    networks
+      :theme       theme
       :blur?       blur?
       :description description}]
 
@@ -197,11 +205,11 @@
 (defn view
   [{:keys [title title-icon type description blur? community-name community-logo button-icon
            account-name emoji context-tag-type button-type container-style
-           on-button-press on-button-long-press profile-picture stored label full-name
+           on-button-press on-button-long-press profile-picture stored networks label full-name
            button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
            context icon]}]
   (let [theme (quo.theme/use-theme)]
-    [rn/view {:style [style/container container-style]}
+    [rn/view {:style (merge style/container container-style)}
      (when (left-image-supported-types type)
        [rn/view {:style style/left-container}
         [left-image
@@ -225,6 +233,7 @@
         :theme               theme
         :blur?               blur?
         :stored              stored
+        :networks            networks
         :description         description
         :community-name      community-name
         :community-logo      community-logo

src/quo/components/empty_state/empty_state/styles.cljs

@@ -35,4 +35,4 @@
 (def image-placeholder
   {:width            80
    :height           80
-   :background-color colors/danger-50})
+   :background-color colors/danger})

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

@@ -18,5 +18,5 @@
         :colors              [color-top color-bottom]
         :start               {:x 0 :y 0}
         :end                 {:x 0 :y 1}
-        :style               [(style/root-container opacity height)
+        :style               (merge (style/root-container opacity height)
-                              container-style]}])))
+                                    container-style)}])))

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

@@ -53,7 +53,7 @@
     (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)))
 
 (defn address-input
-  [{:keys [default-value blur? on-change-text on-blur on-focus on-clear on-scan on-paste
+  [{:keys [default-value blur? on-change-text on-blur on-focus on-clear on-scan
            on-detect-ens on-detect-address on-detect-unclassified address-regex ens-regex
            valid-ens-or-address? container-style]}]
   (let [theme                  (quo.theme/use-theme)
@@ -82,13 +82,12 @@
                                                (not ens?)
                                                on-detect-unclassified)
                                       (on-detect-unclassified text)))))
-        on-paste               (rn/use-callback #(if (fn? on-paste)
+        on-paste               (rn/use-callback
-                                                   (on-paste on-change)
+                                (fn []
-                                                   (clipboard/get-string
+                                  (clipboard/get-string
-                                                    (fn [clipboard]
+                                   (fn [clipboard]
-                                                      (when-not (empty? clipboard)
+                                     (when-not (empty? clipboard)
-                                                        (on-change clipboard)))))
+                                       (on-change clipboard))))))
-                                                [on-paste])
         on-clear               (rn/use-callback
                                 (fn []
                                   (on-change "")

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

@@ -31,7 +31,7 @@
        :placeholder  (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :error
-      {:border-color colors/danger-50-opa-40
+      {:border-color (colors/theme-colors colors/danger-opa-40 colors/danger-opa-40 theme)
        :placeholder  (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :disabled
@@ -48,7 +48,7 @@
        :placeholder  (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :error
-      {:border-color colors/danger-50-opa-40
+      {:border-color (colors/theme-colors colors/danger-opa-40 colors/danger-opa-40 theme)
        :placeholder  (colors/theme-colors colors/neutral-40 colors/white-opa-40 theme)
        :text         (colors/theme-colors colors/neutral-100 colors/white theme)}
       :disabled