lint

PR comments
approach
2024-01-25 10:02:04 +02:00 · 2024-01-25 09:33:11 +02:00 · 2024-01-25 09:33:10 +02:00 · 2024-01-25 09:33:08 +02:00
107 changed files with 1629 additions and 1679 deletions
@@ -78,7 +78,9 @@ pipeline {
        }
        stage('Upload') {
          steps { script {
-            env.DIAWI_URL = ios.uploadToDiawi()
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+              env.DIAWI_URL = ios.uploadToDiawi()
+            }
            env.PKG_URL = env.DIAWI_URL
            jenkins.setBuildDesc(IPA: env.PKG_URL)
          } }
@@ -144,9 +144,9 @@ used for keycard
 used for svg icons, mostly collectibles are using svg
 TODO: updating requires a pod update on iOS

-## "react-native-biometrics": "^3.0.1"
+## "react-native-touch-id": "^4.4.1"

-used for biometric authentication on Android and iOS 
+used for touch-id identification

 ## "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_3"

@@ -305,8 +305,6 @@ PODS:
    - glog
  - react-native-background-timer (2.2.0):
    - React
-  - react-native-biometrics (3.0.1):
-    - React-Core
  - react-native-blob-util (0.13.18):
    - React-Core
  - react-native-blur (4.3.3):
@@ -519,6 +517,8 @@ PODS:
  - SocketRocket (0.6.1)
  - SSZipArchive (2.4.3)
  - TOCropViewController (2.6.1)
+  - TouchID (4.4.1):
+    - React
  - Yoga (1.14.0)

 DEPENDENCIES:
@@ -548,7 +548,6 @@ DEPENDENCIES:
  - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
  - react-native-background-timer (from `../node_modules/react-native-background-timer`)
-  - react-native-biometrics (from `../node_modules/react-native-biometrics`)
  - react-native-blob-util (from `../node_modules/react-native-blob-util`)
  - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
@@ -604,6 +603,7 @@ DEPENDENCIES:
  - RNSVG (from `../node_modules/react-native-svg`)
  - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
  - SSZipArchive (= 2.4.3)
+  - TouchID (from `../node_modules/react-native-touch-id`)
  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

 SPEC REPOS:
@@ -669,8 +669,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/logger"
  react-native-background-timer:
    :path: "../node_modules/react-native-background-timer"
-  react-native-biometrics:
-    :path: "../node_modules/react-native-biometrics"
  react-native-blob-util:
    :path: "../node_modules/react-native-blob-util"
  react-native-blur:
@@ -780,6 +778,8 @@ EXTERNAL SOURCES:
  secp256k1:
    :git: https://github.com/status-im/secp256k1.swift.git
    :submodules: true
+  TouchID:
+    :path: "../node_modules/react-native-touch-id"
  Yoga:
    :path: "../node_modules/react-native/ReactCommon/yoga"

@@ -793,7 +793,7 @@ CHECKOUT OPTIONS:
    :submodules: true

 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 64032b9e9b938fda23325e68a3771f0fabf414dc
  BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -822,7 +822,6 @@ SPEC CHECKSUMS:
  React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
  React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
-  react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
  react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
@@ -882,6 +881,7 @@ SPEC CHECKSUMS:
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
+  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
  Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6

 PODFILE CHECKSUM: 3f98ce893757dfa17e609ef7cd24fa41635b73a6
@@ -1055,6 +1055,21 @@
    }
  },

+  {
+    "path": "androidx/databinding/databinding-common/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-common-3.3.1.pom": {
+        "sha1": "2e932d3219ea5f6d1078b24a8a3ce24b209c9309",
+        "sha256": "sha256-J5Qv7Gy8ROM19MN5Rx/lo2BsA7Zwt+NG6lXxYtjrF10="
+      },
+      "databinding-common-3.3.1.jar": {
+        "sha1": "45795e2f688474b219d37beb7f9f6756578e6454",
+        "sha256": "sha256-mq9hUr+3QZCgovJ1St/aoqkP7Ef50KwR811ej5iYkyw="
+      }
+    }
+  },
+
  {
    "path": "androidx/databinding/databinding-common/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -1164,6 +1179,21 @@
    }
  },

+  {
+    "path": "androidx/databinding/databinding-compiler-common/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-compiler-common-3.3.1.pom": {
+        "sha1": "123c2b1dd44ec6e2441be9441bdf393462936928",
+        "sha256": "sha256-na2hPeqxkcTcC9T7EvFs12+r1ygfSfnOHIirb3kXyzI="
+      },
+      "databinding-compiler-common-3.3.1.jar": {
+        "sha1": "e96aa159e1ed5c5a3461d15adfc42ef5b1f68b59",
+        "sha256": "sha256-sfLOroi0d73GMp2r8SCNhCHFrT/HzPpEOXEOVBcvxh0="
+      }
+    }
+  },
+
  {
    "path": "androidx/databinding/databinding-compiler-common/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2725,6 +2755,21 @@
    }
  },

+  {
+    "path": "com/android/databinding/baseLibrary/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "baseLibrary-3.3.1.pom": {
+        "sha1": "611fd96b47fdd27dd88afc23829975278d47774c",
+        "sha256": "sha256-dKLQobB7s6ExmWyEIG/CHmDQaT4pa7EI07c9B7hnUj8="
+      },
+      "baseLibrary-3.3.1.jar": {
+        "sha1": "702acc804e85563d3ae7b8ee49122e4f857dde83",
+        "sha256": "sha256-5QRyEqpp1J0FULCvlrQQC4xslwG4PD+24ZzGbzxK6cQ="
+      }
+    }
+  },
+
  {
    "path": "com/android/databinding/baseLibrary/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3243,6 +3288,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/crash/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "crash-26.3.1.pom": {
+        "sha1": "7b667eb48f02b8ba2a981a962e9c1137e251c1e0",
+        "sha256": "sha256-m0FH4hP4dmWwzUXF6w47Q79EWJf5r9rKF/c8wjjF01c="
+      },
+      "crash-26.3.1.jar": {
+        "sha1": "46163f2cf0e16a1ba9be2ad6dddc39f1a1d6b613",
+        "sha256": "sha256-k5OoPOLz+pZ4LCU98yROaZo7PfGG3pJssTiVj6+VYpM="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/crash/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3382,6 +3442,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/protos/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "protos-26.3.1.pom": {
+        "sha1": "d6015a3a017dcb62d9a9a56c28b5c47bb6727a91",
+        "sha256": "sha256-IP1qlda7IElg7qdLFBTEWy78J0+4Tf90MnqRYezfc3k="
+      },
+      "protos-26.3.1.jar": {
+        "sha1": "f35a0accd93cfbb4306268ea748e1ac49920a0a8",
+        "sha256": "sha256-70/09xLY//RrI3jBwQh5l1hXdvpsGhwgBpbXd0eNnUw="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/protos/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3521,6 +3596,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/shared/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "shared-26.3.1.pom": {
+        "sha1": "af1e1e7d120696bfee452247b5224290d91d828f",
+        "sha256": "sha256-3Hxmxmp5mFLNaGRaEXOJSRxiTU1U+OzdX5QENgHtys4="
+      },
+      "shared-26.3.1.jar": {
+        "sha1": "3457faee7a68d84dcbd258889567153acfc731a2",
+        "sha256": "sha256-bSe5quJj4rwth0SR72dh86WuH34wzEq2v7ktd/2tO/A="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/shared/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3660,6 +3750,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/tracker/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "tracker-26.3.1.pom": {
+        "sha1": "6775a4eeafd2ef5270750388ee53503eeafa688b",
+        "sha256": "sha256-+mgVCnuDFGnXWVQ1ZGPkmcJjl1ubk/YmTQ3qjRHlKwg="
+      },
+      "tracker-26.3.1.jar": {
+        "sha1": "26248cad2525e003752322cfc6bd86182df7daac",
+        "sha256": "sha256-JG6AgEtANgzjGNp7nRKUjgrUHQwpzHvbOGF9weaWnYg="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/tracker/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3799,6 +3904,21 @@
    }
  },

+  {
+    "path": "com/android/tools/annotations/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "annotations-26.3.1.pom": {
+        "sha1": "bce2159e811cceee12498cb34812cbae1e7b8eda",
+        "sha256": "sha256-Y7XWCr1wC4On07xPXk1+cRxZsOB6WsMmd2FOP/1xJLE="
+      },
+      "annotations-26.3.1.jar": {
+        "sha1": "3d46d5da6d5dd17df682a22b914cdc6b84677731",
+        "sha256": "sha256-U0rc5Q64KdT4yXW8NOpVs49oxjAOAA4rR8Q6xnLQxyE="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/annotations/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4226,6 +4346,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/apksig/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apksig-3.3.1.pom": {
+        "sha1": "e916d810d293ce4ab620435b41d2e3bc67972cd3",
+        "sha256": "sha256-cGliMgmhK5sal8XJypuekagqDkDG4h4LlMc5barHh80="
+      },
+      "apksig-3.3.1.jar": {
+        "sha1": "5dc32667e573a18b05119685ac3f2b8c0f17182d",
+        "sha256": "sha256-NXs57dinjUgKlT5rl8CYWf1AyXLBpJtvnTvT1LmYyy0="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/apksig/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4335,6 +4470,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/apkzlib/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apkzlib-3.3.1.pom": {
+        "sha1": "02214cdec00c2553430192a7f36e9a28cf96bf6f",
+        "sha256": "sha256-IVhIC03ar9F8K15CEeAPstojFB93BY+VjRqUlFBZ0IU="
+      },
+      "apkzlib-3.3.1.jar": {
+        "sha1": "0563a5b71668b4fe7da03a0a3054c9fdd973d3cf",
+        "sha256": "sha256-ZAVmwOT1BZATm7z7sP90TB9tzZ8mL48tAVn8QZQTgcw="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/apkzlib/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4474,6 +4624,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-model/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-model-3.3.1.pom": {
+        "sha1": "4011d22709777c4063e84d39dbfe4ed535a31905",
+        "sha256": "sha256-XVNezIVtl4YN/ZElCFrqki4FTrfZ4SRPg3p0n76b++M="
+      },
+      "builder-model-3.3.1.jar": {
+        "sha1": "2c47cf0451da2eaad484ccd2d580a8cfd23fa064",
+        "sha256": "sha256-BXtSlcP+jNze+uaN47+/nHbTnaI+BMw0ZdZgA3oxfwA="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-model/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4625,6 +4790,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-test-api/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-test-api-3.3.1.pom": {
+        "sha1": "e79a310b9c89fcb62f343b727f5747783c778861",
+        "sha256": "sha256-heZof7B9lqEFRE1Rouwnrz9798H5w72QcGZ9QblfZAY="
+      },
+      "builder-test-api-3.3.1.jar": {
+        "sha1": "c1a1ce91c0f34c43a52c54c1a2f6fdbaafadd3da",
+        "sha256": "sha256-KYnV5vE5YwFoEC40dwJCFbnKvew+Gqc4saBze0tfyww="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-test-api/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4776,6 +4956,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-3.3.1.pom": {
+        "sha1": "fbca96adc8069b8fcb01c7271c3b4be4f901b517",
+        "sha256": "sha256-pg/e6U4EqMemXDi6m2UFhcOkv0cisGFnuI85cO4UA+Q="
+      },
+      "builder-3.3.1.jar": {
+        "sha1": "e4d2ad1ef694fca700b3ab1f4df4b79313d17c98",
+        "sha256": "sha256-zoj1PYZLXN+oW1cC5yiz1u0NOqkoy2HghCRtSlUBXFI="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4897,6 +5092,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/bundletool/0.6.0",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "bundletool-0.6.0.pom": {
+        "sha1": "5a6e5b5af1687285125f43e00a8e5a8efe6f76a4",
+        "sha256": "sha256-YDqi6WyRrkPynACNA16mdo0fJya6qjAqXwzYBFfgRiI="
+      },
+      "bundletool-0.6.0.jar": {
+        "sha1": "fb944be26f692e6ac937924ad5be7faa4093dd80",
+        "sha256": "sha256-QAU1QDlstRlZ0GYLSihk7mqBaXi/AT/UwB3L7IlcS7o="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/bundletool/0.9.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5032,6 +5242,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle-api/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-api-3.3.1.pom": {
+        "sha1": "c9a6cecdb5e233c2ffde76507bddc6f26ade5528",
+        "sha256": "sha256-3BUSdrg4w9TdT8QdcwRoOkTGotjb3ngpdN9p+1g8dRQ="
+      },
+      "gradle-api-3.3.1.jar": {
+        "sha1": "93aac19942998e480db4195212150fb30f7a78cd",
+        "sha256": "sha256-SMmx/OFMswX3/3XdL97Ds/qtZK/pFQbviYoEsIbmtBY="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle-api/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5232,6 +5457,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-3.3.1.pom": {
+        "sha1": "1769370bffda87132eb79580bf54ccb9eb339020",
+        "sha256": "sha256-9eitp3Q6B3or5f+qF0Q0VmkSQa7ZEoYVgAXzUcRA/3w="
+      },
+      "gradle-3.3.1.jar": {
+        "sha1": "7d642f14aa35443dd7aeecd0600c17da37d3bccc",
+        "sha256": "sha256-9WSZq8Ux35uuhlFo5y8kCHAtSgH0bXuMGgowDWLcEb0="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5353,6 +5593,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "jetifier-core-1.0.0-beta02.pom": {
+        "sha1": "db878af76000b681798b114a5169163b1efe59ea",
+        "sha256": "sha256-kJGGklY7MCjkeLrxyUM3jfSIOTpSeJWMbzaWO2jfw7k="
+      },
+      "jetifier-core-1.0.0-beta02.jar": {
+        "sha1": "fa93fdb83bdfd51e80e09a808fb2515a7134d406",
+        "sha256": "sha256-72H4QwL4tB3OOFjB/H56kOx0omOgITsfZegMVhRaR5M="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5417,6 +5672,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "jetifier-processor-1.0.0-beta02.pom": {
+        "sha1": "3bf006f5a449806a9ad493a99c9f9417b3040ef0",
+        "sha256": "sha256-+zYwiX233O8PE6VViKrYxkvcGPZ64KHizNR1igcioa8="
+      },
+      "jetifier-processor-1.0.0-beta02.jar": {
+        "sha1": "624d187319c8dfd6bc8281b4afbab87c39bbb005",
+        "sha256": "sha256-J+UFZWvlNLNIYHQy/EEeKVQLCE0NTkhlIyqnYswe9Aw="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5511,6 +5781,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/manifest-merger/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "manifest-merger-26.3.1.pom": {
+        "sha1": "1aad18d13e7389cf148b1c6c468b2947ca23cbbd",
+        "sha256": "sha256-YNhLNKJlpgVeZhxpOvIFB1mgbYpuXLpk370esi0vpPU="
+      },
+      "manifest-merger-26.3.1.jar": {
+        "sha1": "aa94f738e318fc73059d9207f433f13556072d05",
+        "sha256": "sha256-hNrba75FBJgCeexO/2RdkaGgsPpagAQjmjS5vOZ1crU="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/manifest-merger/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5662,6 +5947,21 @@
    }
  },

+  {
+    "path": "com/android/tools/common/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "common-26.3.1.pom": {
+        "sha1": "b79360c83ea68ba7f0ac0fadf7c48e1a53511352",
+        "sha256": "sha256-mvrBYjeX9GBEevDT9gMuQfLdXx1N7pSbd3OBSR6NxVM="
+      },
+      "common-26.3.1.jar": {
+        "sha1": "b0e3aa846dd94f9608018f7ef6501d1069f6488c",
+        "sha256": "sha256-QashymLYGxzYciSbVSlD1rzTZmN32f1/cY3rQd7HM9Y="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/common/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5801,6 +6101,21 @@
    }
  },

+  {
+    "path": "com/android/tools/ddms/ddmlib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "ddmlib-26.3.1.pom": {
+        "sha1": "14405d92c982c96ace23b7a4c505b0d9de58cd8d",
+        "sha256": "sha256-MhUp9OEUJ8VtX0uLtcJkLAHza1LkO1wwnEk81IM9sNE="
+      },
+      "ddmlib-26.3.1.jar": {
+        "sha1": "61ca2873fcce1012ba9782adf7e9b0e164fb6007",
+        "sha256": "sha256-oTYJ+lhJr4+Os0JzaOG8KMp7DwSvKGwLqVoAfrkkHro="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/ddms/ddmlib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5940,6 +6255,21 @@
    }
  },

+  {
+    "path": "com/android/tools/dvlib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "dvlib-26.3.1.pom": {
+        "sha1": "c438f3c025bd878ac3b54368e012b3792f9c8928",
+        "sha256": "sha256-3lL/6GFK8OCRXxbiIujskxfriVuL9GtfE7hU8B2mDdY="
+      },
+      "dvlib-26.3.1.jar": {
+        "sha1": "971430b6163a834656d07434c46fee64d109ad8e",
+        "sha256": "sha256-cLMOL4Sc+kKqE7+GWenhTAKtfLSkbLKB4CKOuC5XM4s="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/dvlib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6184,6 +6514,21 @@
    }
  },

+  {
+    "path": "com/android/tools/layoutlib/layoutlib-api/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "layoutlib-api-26.3.1.pom": {
+        "sha1": "0355e0146c59a91fbb303d7faaa6d2d0413f5dde",
+        "sha256": "sha256-az/hSE+y4dWr/4VYc0KxX5tM3W6E/Vkjm9r7ShTtLXg="
+      },
+      "layoutlib-api-26.3.1.jar": {
+        "sha1": "969ef3a7c0c3b245a3efe8aff7a2f6f15ff4e824",
+        "sha256": "sha256-Tk6yS7wTU2sl1t063kHZJWr1rnuBpBe5a1WEMLUKQV4="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/layoutlib/layoutlib-api/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6383,6 +6728,21 @@
    }
  },

+  {
+    "path": "com/android/tools/lint/lint-gradle-api/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "lint-gradle-api-26.3.1.pom": {
+        "sha1": "dbdbed4b5fa948b991335771c7005fc8aa8be73b",
+        "sha256": "sha256-6xds70C7k1Yy8gaACv2XSeMP+suuYIgzflDCP2vG5CA="
+      },
+      "lint-gradle-api-26.3.1.jar": {
+        "sha1": "d55e1bcbe4e7c0bb97f5c385a003c4339e38d07f",
+        "sha256": "sha256-RcBjcp/izzXWOh/9Ih17gtPkpxWay2AvqWuc/5BN5sk="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/lint/lint-gradle-api/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6657,6 +7017,21 @@
    }
  },

+  {
+    "path": "com/android/tools/repository/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "repository-26.3.1.pom": {
+        "sha1": "ab5a2f6cbedccf4ff9efbd5301fe26c9d1aaea2a",
+        "sha256": "sha256-VRlYrn5H3gUTtUim8TrCf8Bv8/Ww/x6aQ8SAjzRz6zc="
+      },
+      "repository-26.3.1.jar": {
+        "sha1": "0fe4c713437ebfb8c68e95c717c063843bd63758",
+        "sha256": "sha256-UZR25PiBJMbbndC98J8MSqXMi/Hvq4Dd3uL3Wmug784="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/repository/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6796,6 +7171,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdklib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdklib-26.3.1.pom": {
+        "sha1": "d6cfc0d8a0f49620138cfaea6c51201c7c678633",
+        "sha256": "sha256-gnUcqRaojEMoL7ZX1kJerqAstwsEAJlroYEZr6GRRCE="
+      },
+      "sdklib-26.3.1.jar": {
+        "sha1": "85c3c1de8824ca1f5ff491690931256c23a7297b",
+        "sha256": "sha256-aEN9Fbfmle8G6Yu88HEQQJlVtjsBijR7pofwGuxQfQo="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdklib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6935,6 +7325,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdk-common/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdk-common-26.3.1.pom": {
+        "sha1": "9b7b4248e21db9c342dba7c3e891f740246b97c3",
+        "sha256": "sha256-jFp1bExxaochJmmIvOMohkjrj3uDF3DFct1Pcp85iqg="
+      },
+      "sdk-common-26.3.1.jar": {
+        "sha1": "c9bed0f05024f919fe6168ef381afbe72074a272",
+        "sha256": "sha256-s2dcStd5EUHIfzaADxkUIz8q9Rx2b+F67BsVIsgOL8g="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdk-common/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -10937,6 +11342,17 @@
    }
  },

+  {
+    "path": "com/google/guava/guava-parent/26.0-jre",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "guava-parent-26.0-jre.pom": {
+        "sha1": "3a638a46e3277ff6a3d43d2a50bcccfac2966815",
+        "sha256": "sha256-u31c1BfA19714+Jwkv3SNSLT/CUa2KB5VsE84Fc66qM="
+      }
+    }
+  },
+
  {
    "path": "com/google/guava/guava-parent/27.0.1-jre",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -11089,6 +11505,21 @@
    }
  },

+  {
+    "path": "com/google/guava/guava/26.0-jre",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "guava-26.0-jre.pom": {
+        "sha1": "7883e19f8b0cca8c4498d476743e31b107674155",
+        "sha256": "sha256-HDN63JpKtLhE2oHahZNlgbiUbHy3EoTF3L2vHqp+4Qk="
+      },
+      "guava-26.0-jre.jar": {
+        "sha1": "6a806eff209f36f635f943e16d97491f00f6bfab",
+        "sha256": "sha256-oOnKutZlvCC80rAfEI5fwD91bhOuqAq6rbn0BwM76iw="
+      }
+    }
+  },
+
  {
    "path": "com/google/guava/guava/27.0.1-jre",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -13690,16 +14121,16 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy-agent/1.14.11",
+    "path": "net/bytebuddy/byte-buddy-agent/1.14.10",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-agent-1.14.11.pom": {
-        "sha1": "00a2165ce3253489dd9fd0836a169dfce74e2042",
-        "sha256": "sha256-VBMQ/3WsTurkYFUJn8Ec3b5TqcBe6vry9wMgZQ2zzOk="
+      "byte-buddy-agent-1.14.10.pom": {
+        "sha1": "ab24aa41b81d9496ec9ccd188a0449327d93bfdf",
+        "sha256": "sha256-U7yX6ca/fC0OX5y6x9Xeaykk2RbPS4F+ajo1kpx5a0o="
      },
-      "byte-buddy-agent-1.14.11.jar": {
-        "sha1": "f9cb566608fbac6bc7bf54901a7aa11543a989ee",
-        "sha256": "sha256-L1N6Yhpk+nAT1oxpWnajTujXna105jXKyhbdViV664A="
+      "byte-buddy-agent-1.14.10.jar": {
+        "sha1": "90ed94ac044ea8953b224304c762316e91fd6b31",
+        "sha256": "sha256-Z5k6idR8pY/4aIAqREjd0VDl/k5aVkXe2ZDXtNVXprk="
      }
    }
  },
@@ -13727,12 +14158,12 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy-parent/1.14.11",
+    "path": "net/bytebuddy/byte-buddy-parent/1.14.10",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-parent-1.14.11.pom": {
-        "sha1": "696bf3e007e88bd1c0c2d877d74e0f3c56f2b96f",
-        "sha256": "sha256-RsDxP8l3jcLrtpdIgjqixMvwfqt9GMaqGRxSnRZQiSs="
+      "byte-buddy-parent-1.14.10.pom": {
+        "sha1": "4c560a925c30d5911dc875af5af4737e21b397be",
+        "sha256": "sha256-xpghkGD7DlZaDyyWCU6Ssg7+FG/WFjayyeTAO9m6Sns="
      }
    }
  },
@@ -13768,16 +14199,16 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy/1.14.11",
+    "path": "net/bytebuddy/byte-buddy/1.14.10",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-1.14.11.pom": {
-        "sha1": "5ecfcd2f75aa8c7b6347d864a4d0a5212c360301",
-        "sha256": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
+      "byte-buddy-1.14.10.pom": {
+        "sha1": "8806052a8770a6b3e14362ed0ce6ef263e6a20ab",
+        "sha256": "sha256-zVh4KEX/ju3y7YOgw+30Xu65nhTAWvii6QGGDqCAzq8="
      },
-      "byte-buddy-1.14.11.jar": {
-        "sha1": "725602eb7c8c56b51b9c21f273f9df5c909d9e7d",
-        "sha256": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM="
+      "byte-buddy-1.14.10.jar": {
+        "sha1": "8117daf4a612122eb4f517f66adff778cb8b4737",
+        "sha256": "sha256-MObgRGQ3pn2zfit/fTP1B4fd/ZcDWTGd/QVGnaoty84="
      }
    }
  },
@@ -17391,6 +17822,21 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-reflect/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-reflect-1.3.20.pom": {
+        "sha1": "7cc0e8dc8e9bf863127aee4501449e25e85a6f78",
+        "sha256": "sha256-ajZdjTUpX69X8t86ssuQQgnaqsiQb8Y3R9Pjv6sJPeI="
+      },
+      "kotlin-reflect-1.3.20.jar": {
+        "sha1": "cd49eec32cf964333faf59e04b4085eac7008477",
+        "sha256": "sha256-7hqSbtZY594ObfAkLNV0s7TgjmT+emgngibG8tM3Mjg="
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-reflect/1.3.50",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17781,6 +18227,21 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-common-1.3.20.pom": {
+        "sha1": "507fa9faf5120c5c5247bc1b23476ad91760c09c",
+        "sha256": "sha256-BIjdHCYv5hfXc2K8Sa+BjYztQJQ6pbA8GITb8kdRCjA="
+      },
+      "kotlin-stdlib-common-1.3.20.jar": {
+        "sha1": "7d7934e26ce34da1a0a8d00e38038d7cf3375e89",
+        "sha256": "sha256-Br3Yrto0fvbvPk6diKASVMzbcHhLaXSV9qQh/WY6tkk="
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18066,6 +18527,21 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jdk7-1.3.20.pom": {
+        "sha1": "665178dfa4d04de64edecf5f0dbda61b55f8f4e3",
+        "sha256": "sha256-SdtmBiZNOmpI+QgzXASEYirVyPTfjEjdSgAmdA4eFsU="
+      },
+      "kotlin-stdlib-jdk7-1.3.20.jar": {
+        "sha1": "aa17d6fd473ce53061a7b2b9d2ae96f547cae93d",
+        "sha256": "sha256-/Sr3C90rwCT7A8vtYzyhQ4cso2pqFuIYzGfIkLefsx0="
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18246,6 +18722,21 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jdk8-1.3.20.pom": {
+        "sha1": "5c65523f57e3918ef722a15faae5173fc9a31331",
+        "sha256": "sha256-DF+73Rh7hSpRoKP7YskCSdpOdN//jf/5RphOL3AlCkI="
+      },
+      "kotlin-stdlib-jdk8-1.3.20.jar": {
+        "sha1": "b1f3cb184c4ce4139741454df2f8fca5320f822d",
+        "sha256": "sha256-bAgx5+OsqjkL8i952B8y8hLcj94ZgHo1Sk7k9migxHg="
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18471,6 +18962,21 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-1.3.20.pom": {
+        "sha1": "9d1e01f424795aa471a8def0b5dc8aeeb537aafd",
+        "sha256": "sha256-Mu+dGkDXXOr0F5KW7VTdylp+ekpl4aAZ5kmOusg14Rw="
+      },
+      "kotlin-stdlib-1.3.20.jar": {
+        "sha1": "eb2a232734e09fcd1b958a5c7520a93c6de38b32",
+        "sha256": "sha256-YB+RDalo+z2o6te2Tta/XJcQ2DzqN+SmMYR+fWiOM2E="
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.3.31",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -19160,16 +19666,16 @@
  },

  {
-    "path": "org/mockito/mockito-core/5.9.0",
+    "path": "org/mockito/mockito-core/5.8.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "mockito-core-5.9.0.pom": {
-        "sha1": "2054dcc15b9ede899cb9ec6e8e960e36c68b4574",
-        "sha256": "sha256-BJDEL+Yu7WRzQdpAojcHGW2BO0TbKj3KMB2IFz56yPc="
+      "mockito-core-5.8.0.pom": {
+        "sha1": "a2b7b33c5d649a2f48b1e7aab95d81671f66875f",
+        "sha256": "sha256-dJWKzd4UjzC/ox/8CFi2L3H2PMws602KjGfX9CjUOi0="
      },
-      "mockito-core-5.9.0.jar": {
-        "sha1": "faa88b96db3aeb96a93e83dec7491345bfbfc414",
-        "sha256": "sha256-u62Rhe1zSWX6x+Nn8OUVlvaVMeUdiyy87BBI3W+0Hyw="
+      "mockito-core-5.8.0.jar": {
+        "sha1": "df310627f77f859114ad31e1376fff0dce263cca",
+        "sha256": "sha256-wyD2YqA8KVHtzFGkS2TXmo6ZQ3P/VIRTtf2vad6+RoI="
      }
    }
  },
@@ -49,6 +49,7 @@ androidx.core:core:1.7.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
+androidx.databinding:databinding-common:3.3.1
 androidx.databinding:databinding-common:3.5.4
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
@@ -56,6 +57,7 @@ androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
 androidx.databinding:databinding-common:7.4.2
 androidx.databinding:databinding-compiler-common:3.2.1
+androidx.databinding:databinding-compiler-common:3.3.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
@@ -157,6 +159,7 @@ com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
+com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
@@ -167,6 +170,7 @@ com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
+com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
@@ -176,6 +180,7 @@ com.android.tools.analytics-library:crash:30.4.2
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
+com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
@@ -185,6 +190,7 @@ com.android.tools.analytics-library:protos:30.4.2
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
+com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
@@ -194,6 +200,7 @@ com.android.tools.analytics-library:shared:30.4.2
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
+com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
@@ -201,10 +208,12 @@ com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
 com.android.tools.analytics-library:tracker:30.4.2
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
@@ -223,6 +232,7 @@ com.android.tools.build:aaptcompiler:7.4.2
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
+com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
@@ -230,6 +240,7 @@ com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
 com.android.tools.build:apksig:7.4.2
 com.android.tools.build:apkzlib:3.2.1
+com.android.tools.build:apkzlib:3.3.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
@@ -241,6 +252,7 @@ com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
+com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
@@ -252,6 +264,7 @@ com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
+com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
@@ -263,6 +276,7 @@ com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
+com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
@@ -270,6 +284,7 @@ com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
 com.android.tools.build:builder:7.4.2
 com.android.tools.build:bundletool:0.5.0
+com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
@@ -279,6 +294,7 @@ com.android.tools.build:bundletool:1.11.4
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
+com.android.tools.build:gradle-api:3.3.1
 com.android.tools.build:gradle-api:3.5.4
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
@@ -295,6 +311,7 @@ com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
+com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
@@ -305,6 +322,7 @@ com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
+com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
@@ -318,6 +336,7 @@ com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
+com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
@@ -336,6 +355,7 @@ com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
+com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
@@ -351,6 +371,7 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
+com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
@@ -391,6 +412,7 @@ com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
+com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
@@ -402,6 +424,7 @@ com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
+com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
@@ -413,6 +436,7 @@ com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
+com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
@@ -422,6 +446,7 @@ com.android.tools:dvlib:30.4.2
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
+com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
@@ -433,6 +458,7 @@ com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
+com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
@@ -444,6 +470,7 @@ com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
+com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
@@ -563,6 +590,7 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
 com.google.guava:guava:22.0
 com.google.guava:guava:23.0
+com.google.guava:guava:26.0-jre
 com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
 com.google.guava:guava:29.0-jre
@@ -789,6 +817,7 @@ org.jetbrains.kotlin:kotlin-project-model:1.6.20
 org.jetbrains.kotlin:kotlin-project-model:1.9.0
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
+org.jetbrains.kotlin:kotlin-reflect:1.3.20
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
@@ -805,6 +834,7 @@ org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
@@ -813,6 +843,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@@ -821,6 +852,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
@@ -829,6 +861,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32
@@ -62,6 +62,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.7.0/core-1.7.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.3.1/databinding-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
@@ -69,6 +70,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.4.2/databinding-common-7.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.3.1/databinding-compiler-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
@@ -168,6 +170,7 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/run
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
@@ -202,6 +205,7 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/su
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.3.1/crash-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
@@ -211,6 +215,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
@@ -220,6 +225,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
@@ -229,6 +235,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
@@ -238,6 +245,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
@@ -263,6 +271,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.4
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
@@ -270,6 +279,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.4.2/apksig-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
@@ -279,6 +289,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.4.2/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
@@ -288,6 +299,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
@@ -297,6 +309,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
@@ -304,6 +317,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.1/builder-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.4.2/builder-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0/bundletool-1.6.0.pom
@@ -313,6 +327,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.11.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
@@ -325,6 +340,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
@@ -332,16 +348,19 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.1/gradle-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.4.2/gradle-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04/jetifier-core-1.0.0-beta04.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta09/jetifier-core-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta10/jetifier-core-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-alpha10/jetifier-processor-1.0.0-alpha10.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02/jetifier-processor-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04/jetifier-processor-1.0.0-beta04.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
@@ -351,6 +370,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
@@ -360,6 +380,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.4.2/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
@@ -369,6 +390,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.4.2/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
@@ -385,6 +407,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
@@ -398,6 +421,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.4.2/lint-checks-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.4.2/lint-gradle-30.4.2.pom
@@ -416,6 +440,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/30.4.2/
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
@@ -425,6 +450,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.4.2/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
@@ -434,6 +460,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.4.2/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
@@ -688,6 +715,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-pa
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/23.0/guava-parent-23.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-jre/guava-parent-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/27.0.1-jre/guava-parent-27.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/28.1-jre/guava-parent-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/29.0-jre/guava-parent-29.0-jre.pom
@@ -700,6 +728,7 @@ 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
 https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-android/guava-26.0-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-jre/guava-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/27.0.1-jre/guava-27.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/28.1-jre/guava-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/29.0-jre/guava-29.0-jre.pom
@@ -884,13 +913,13 @@ 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.14.11/byte-buddy-agent-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.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.14.11/byte-buddy-parent-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.10/byte-buddy-parent-1.14.10.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.14.11/byte-buddy-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.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
@@ -1138,6 +1167,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.9.0/kotlin-project-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.50/kotlin-reflect-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.pom
@@ -1164,6 +1194,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.9.0/kotlin-script-runtime-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.0/kotlin-stdlib-common-1.3.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.50/kotlin-stdlib-common-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.60/kotlin-stdlib-common-1.3.60.pom
@@ -1183,6 +1214,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.pom
@@ -1195,6 +1227,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
@@ -1210,6 +1243,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/ko
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.71/kotlin-stdlib-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.0/kotlin-stdlib-1.3.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.20/kotlin-stdlib-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.50/kotlin-stdlib-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.60/kotlin-stdlib-1.3.60.pom
@@ -1254,7 +1288,7 @@ https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.po
 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.9.0/mockito-core-5.9.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.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
@@ -19,4 +19,4 @@ trap show_gradle_log ERR
 ./gradlew projects --no-daemon --console plain 2>&1 \
    | tee "${GRADLE_LOG_FILE}" \
    | grep "Project ':" \
-    | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)'.*;\1;"
+    | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)';\1;"
@@ -1,7 +1,6 @@
 app
 react-native-async-storage_async-storage
 react-native-background-timer
-react-native-biometrics
 react-native-blob-util
 react-native-blur
 react-native-camera-kit
@@ -37,5 +36,6 @@ react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
+react-native-touch-id
 react-native-transparent-video
 react-native-webview
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-# script to prompt user for terminating a process
-
-pid="${1}"
-
-read -p "Do you want to terminate this process? (y/n): " choice
-if [[ "${choice}" == "y" ]]; then
-    sudo kill "${pid}"
-    echo "Process ${pid} terminated."
-else
-    echo "Process not terminated. Please close it manually and retry."
-    exit 1
-fi
@@ -22,10 +22,12 @@ nix_purge_linux_multi_user_users() {
 }

 nix_purge_darwin_multi_user_service() {
-    sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    sudo launchctl unload /Library/LaunchDaemons/org.nixos.darwin-store.plist
-    sudo rm /Library/LaunchDaemons/org.nixos.darwin-store.plist
+    cd /Library/LaunchDaemons
+    NIX_SERVICES=(org.nixos.darwin-store.plist org.nixos.nix-daemon.plist)
+    for NIX_SERVICE in "${NIX_SERVICES[@]}"; do
+        sudo launchctl unload "${NIX_SERVICE}" || true
+        sudo launchctl remove "${NIX_SERVICE}" || true
+    done
 }

 nix_purge_darwin_multi_user_users() {
@@ -46,10 +48,18 @@ nix_purge_darwin_multi_user_volumes() {

        # Identify the process using the volume
        local pid=$(lsof +D /nix | awk 'NR==2{print $2}')
-        if [[ -n "$pid" ]]; then
+        if [ -n "$pid" ]; then
            echo "The volume /nix is in use by process ID $pid."
-            "${GIT_ROOT}/nix/scripts/kill_proc_prompt.sh" "${pid}" || return 1

+            # Ask the user whether to terminate the process
+            read -p "Do you want to terminate this process? (y/n): " choice
+            if [[ $choice == "y" ]]; then
+                sudo kill $pid
+                echo "Process $pid terminated."
+            else
+                echo "Process not terminated. Please close it manually and retry."
+                return 1
+            fi
        else
            echo "No process found using /nix. Manual intervention required."
            return 1
@@ -61,9 +71,9 @@ nix_purge_darwin_multi_user_volumes() {

 nix_purge_multi_user() {
    if [[ $(uname -s) == "Darwin" ]]; then
-        nix_purge_darwin_multi_user_service
-        nix_purge_darwin_multi_user_users
-        nix_purge_darwin_multi_user_volumes
+        nix_purge_darwin_multi_user_service || true
+        nix_purge_darwin_multi_user_users || true
+        nix_purge_darwin_multi_user_volumes || true
    else
        nix_purge_linux_multi_user_service
        nix_purge_linux_multi_user_users
@@ -107,7 +117,7 @@ if (return 0 2>/dev/null); then
    return
 fi

-# Confirm user decision, unless --force is used.
+# Confirm user decission, unless --force is used.
 if [[ "${1}" != "--force" ]]; then
    echo -e "${YLW}Are you sure you want to purge Nix?${RST}" >&2
    read -p "[y/n]: " -n 1 -r
@@ -119,7 +129,7 @@ if [[ "${1}" != "--force" ]]; then
 fi

 NIX_INSTALL_TYPE=$(nix_install_type)
-# Purging /nix on NixOS would be disastrous.
+# Purging /nix on NixOS would be disasterous.
 if [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
    echo -e "${RED}You should not purge Nix files on NixOS!${RST}" >&2
    exit
@@ -35,7 +35,6 @@
    "react-dom": "18.0.0",
    "react-native": "0.72.5",
    "react-native-background-timer": "^2.1.1",
-    "react-native-biometrics": "^3.0.1",
    "react-native-blob-util": "^0.13.18",
    "react-native-camera-kit": "14.0.0-beta13",
    "react-native-config": "^1.5.0",
@@ -66,6 +65,7 @@
    "react-native-static-safe-area-insets": "^2.2.0",
    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
    "react-native-svg": "13.10.0",
+    "react-native-touch-id": "^4.4.1",
    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
    "react-native-webview": "13.6.3",
    "react-syntax-highlighter": "^15.5.0",
@@ -1,8 +1,5 @@
 (ns legacy.status-im.data-store.communities
-  (:require
-    [clojure.set :as set]
-    [clojure.walk :as walk]
-    [status-im.constants :as constants]))
+  (:require [clojure.set :as set]))

 (defn rpc->channel-permissions
  [rpc-channels-permissions]
@@ -10,68 +7,3 @@
               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
-
-(defn <-revealed-accounts-rpc
-  [accounts]
-  (mapv
-   #(set/rename-keys % {:isAirdropAddress :airdrop-address?})
-   (js->clj accounts :keywordize-keys true)))
-
-(defn <-request-to-join-community-rpc
-  [r]
-  (set/rename-keys r
-                   {:communityId :community-id
-                    :publicKey   :public-key
-                    :chatId      :chat-id}))
-
-(defn <-requests-to-join-community-rpc
-  [requests key-fn]
-  (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))
-
-(defn <-chats-rpc
-  [chats]
-  (reduce-kv (fn [acc k v]
-               (assoc acc
-                      (name k)
-                      (-> v
-                          (assoc :can-post? (:canPost v))
-                          (dissoc :canPost)
-                          (update :members walk/stringify-keys))))
-             {}
-             chats))
-
-(defn <-categories-rpc
-  [categ]
-  (reduce-kv #(assoc %1 (name %2) %3) {} categ))
-
-(defn <-rpc
-  [c]
-  (-> c
-      (set/rename-keys {:canRequestAccess            :can-request-access?
-                        :canManageUsers              :can-manage-users?
-                        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
-                        :canJoin                     :can-join?
-                        :requestedToJoinAt           :requested-to-join-at
-                        :isMember                    :is-member?
-                        :adminSettings               :admin-settings
-                        :tokenPermissions            :token-permissions
-                        :communityTokensMetadata     :tokens-metadata
-                        :introMessage                :intro-message
-                        :muteTill                    :muted-till
-                        :lastOpenedAt                :last-opened-at
-                        :joinedAt                    :joined-at})
-      (update :admin-settings
-              set/rename-keys
-              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
-      (update :members walk/stringify-keys)
-      (update :chats <-chats-rpc)
-      (update :token-permissions seq)
-      (update :categories <-categories-rpc)
-      (assoc :membership-permissions?
-             (some #(= (:type %) constants/community-token-permission-become-member)
-                   (vals (:tokenPermissions c))))
-      (assoc :token-images
-             (reduce (fn [acc {sym :symbol image :image}]
-                       (assoc acc sym image))
-                     {}
-                     (:communityTokensMetadata c)))))
@@ -164,7 +164,7 @@
   {:MediaStates        {}
    :PlaybackCategories {}})
 (def net-info #js {})
-(def react-native-biometrics #js {:default {}})
+(def touchid #js {})
 (def react-native-image-viewing #js {:default {}})
 (def react-native-static-safe-area-insets #js {:default {}})

@@ -391,7 +391,7 @@
    "react-native-fetch-polyfill"                      fetch
    "react-native-status-keycard"                      status-keycard
    "react-native-keychain"                            keychain
-    "react-native-biometrics"                          react-native-biometrics
+    "react-native-touch-id"                            touchid
    "@react-native-community/netinfo"                  net-info
    "react-native-dialogs"                             dialogs
    "react-native"                                     react-native
@@ -45,7 +45,7 @@
      [:fiat-value :string]
      [:token-value :string]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:state {:optional true} [:enum :pressed :active :default]]
+      [:state [:enum :pressed :active :default]]
      [:on-press {:optional true} [:maybe fn?]]
      [:theme :schema.common/theme]]]]
   :any])
@@ -2,9 +2,7 @@
  (:require
    [quo.components.markdown.text :as text]
    [quo.components.profile.collectible.style :as style]
-    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
-    [react-native.svg :as svg]))
+    [react-native.core :as rn]))

 (defn remaining-tiles
  [amount]
@@ -16,21 +14,12 @@
    (str "+" amount)]])

 (defn tile
-  [{:keys [style size resource]}]
-  (let [svg?        (and (map? resource) (:svg? resource))
-        image-style (style/tile-style-by-size size)]
+  [{:keys [style resource size]}]
+  (let [source (if (string? resource) {:uri resource} resource)]
    [rn/view {:style style}
-     (if svg?
-       [rn/view
-        {:style {:border-radius (:border-radius image-style)
-                 :overflow      :hidden}}
-        [svg/svg-uri (assoc image-style :uri (:uri resource))]]
-       [fast-image/fast-image
-        {:style  image-style
-         :source (if (string? resource)
-                   {:uri      resource
-                    :priority :low}
-                   resource)}])]))
+     [rn/image
+      {:style  (style/tile-style-by-size size)
+       :source source}]]))

 (defn two-tiles
  [{:keys [images size]}]
@@ -27,7 +27,7 @@
     9.213 11.877 8.436 C 11.787 7.866 11.649 7.313 11.468 6.781 Z"
     :clip-path "url(#clip0_5514_84289)"}]
   [svg/defs
-    [svg/clip-path {:id "clip0_5514_84289"}
+    [svg/clippath {:id "clip0_5514_84289"}
     [svg/rect {:width width :height height :fill :none}]]]])

 (defn- content
@@ -15,7 +15,7 @@
     [:token {:optional true} [:or keyword? string?]]
     [:style {:optional true} map?]
     ;; Ignores `token` and uses this as parameter to `rn/image`'s source.
-     [:image-source {:optional true} [:maybe [:or :schema.common/image-source :string]]]]]
+     [:image-source {:optional true} [:or :schema.common/image-source :string]]]]
   :any])

 (defn- size->number
@@ -4,7 +4,7 @@

 (defn container
  [network state theme]
-  {:width              136
+  {:flex               1
   :height             44
   :border-width       1
   :border-radius      12
@@ -10,12 +10,8 @@
    [react-native.core :as rn]))

 (defn network-bridge-add
-  [{:keys [network state theme container-style on-press]}]
-  [rn/pressable
-   {:style    (merge (style/container network state theme)
-                     (style/add-container theme)
-                     container-style)
-    :on-press on-press}
+  [{:keys [network state theme]}]
+  [rn/view {:style (merge (style/container network state theme) (style/add-container theme))}
   [icon/icon :i/add-circle {:size 12 :no-color true}]])

 (defn- network->text
@@ -25,14 +21,13 @@
        :else                 (string/capitalize (name network))))

 (defn view-internal
-  [{:keys [theme network status amount container-style on-press] :as args}]
+  [{:keys [theme network status amount container-style] :as args}]
  (if (= status :add)
    [network-bridge-add args]
-    [rn/pressable
+    [rn/view
     {:style               (merge (style/container network status theme) container-style)
      :accessible          true
-      :accessibility-label :container
-      :on-press            on-press}
+      :accessibility-label :container}
     (if (= status :loading)
       [rn/view
        {:style               (style/loading-skeleton theme)
@@ -1,76 +0,0 @@
-(ns react-native.biometrics
-  (:require
-    ["react-native-biometrics" :default Biometrics]
-    [clojure.string :as string]
-    [oops.core :as oops]
-    [react-native.platform :as platform]
-    [schema.core :as schema]))
-
-(def ^:private ^:const android-not-available-error-message "Biometric hardware unavailable")
-(def ^:private ^:const android-not-enrolled-error-message "No fingerprints enrolled.")
-(def ^:private ^:const ios-not-enrolled-error-message "No identities are enrolled")
-
-(defn get-supported-type
-  "Returns a JS promise that resolves with the biometrics types supported by the
-  device, regardless of whether it's enabled or disabled.
-
-  Resolved values: `:Biometrics` `:FaceID` `:TouchID`"
-  []
-  (-> (Biometrics.)
-      (.isSensorAvailable)
-      (.then (fn [result]
-               (-> result
-                   (oops/oget :biometryType)
-                   keyword)))
-      (.catch (constantly nil))))
-
-(defn get-available
-  "Returns a JS promise that resolves to a boolean, which signifies whether
-  biometrics is enabled/disabled on the device."
-  []
-  (-> (Biometrics.)
-      (.isSensorAvailable)
-      (.then (fn [result]
-               (oops/oget result :available)))))
-
-;; NOTE: the react-native-biometrics package error codes/messages differ across platforms.
-;; On android we get error messages while on iOS it's a stringified Obj-C error object.
-(defn- convert-auth-error-message
-  [message]
-  (let [cause (if platform/android?
-                (condp = message
-                  android-not-enrolled-error-message  ::not-enrolled
-                  android-not-available-error-message ::not-available
-                  ::unknown)
-
-                (condp #(string/includes? %2 %1) message
-                  ios-not-enrolled-error-message ::not-enrolled
-                  ::unknown))]
-    (ex-info "Failed to authenticate with biometrics"
-             {:orig-error-message message}
-             cause)))
-
-(defn authenticate
-  "Returns a JS promise that resolves with a boolean auth success state: `true` for
-  success and `false` when canceled by user."
-  [{:keys [prompt-message fallback-prompt-message cancel-button-text]}]
-  (-> (Biometrics.)
-      (.simplePrompt #js
-                      {"promptMessage"         prompt-message
-                       "fallbackPromptMessage" fallback-prompt-message
-                       "cancelButtonText"      cancel-button-text})
-      (.then (fn [result]
-               (oops/oget result :success)))
-      (.catch (fn [error]
-                (-> (.-message error)
-                    convert-auth-error-message
-                    throw)))))
-
-(schema/=> authenticate
-  [:=>
-   [:cat
-    [:map {:closed true}
-     [:prompt-message string?]
-     [:fallback-prompt-message {:optional true} string?]
-     [:cancel-button-text {:optional true} string?]]]
-   :any])
@@ -20,8 +20,7 @@
       (merge
        props
        {:source   (if (string? source)
-                     {:uri      source
-                      :priority :high}
+                     {:uri source}
                     source)
         :on-error (fn [e]
                     (when-let [on-error (:on-error props)]
@@ -72,11 +72,9 @@

 (defn get-credentials
  "Gets the credentials for a specified server from the Keychain"
-  ([server]
-   (get-credentials server identity))
-  ([server callback]
-   (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
-       (.then callback))))
+  [server callback]
+  (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
+      (.then callback)))

 (defn reset-credentials
  [server]
@@ -6,11 +6,10 @@
 (def svg (reagent/adapt-react-class Svg/default))
 (def path (reagent/adapt-react-class Svg/Path))
 (def rect (reagent/adapt-react-class Svg/Rect))
-(def clip-path (reagent/adapt-react-class Svg/ClipPath))
+(def clippath (reagent/adapt-react-class Svg/ClipPath))
 (def defs (reagent/adapt-react-class Svg/Defs))
 (def circle (reagent/adapt-react-class Svg/Circle))
-(def svg-xml (reagent/adapt-react-class Svg/SvgXml))
-(def svg-uri (reagent/adapt-react-class Svg/SvgUri))
+(def svgxml (reagent/adapt-react-class Svg/SvgXml))
 (def g (reagent/adapt-react-class Svg/G))
 (def linear-gradient (reagent/adapt-react-class Svg/LinearGradient))
 (def stop (reagent/adapt-react-class Svg/Stop))
@@ -0,0 +1,20 @@
+(ns react-native.touch-id
+  (:require
+    ["react-native-touch-id" :default touchid]))
+
+;; currently, for android, react-native-touch-id
+;; is not returning supported biometric type
+;; defaulting to :fingerprint
+(def android-default-support :fingerprint)
+
+(defn get-supported-type
+  [callback]
+  (-> (.isSupported ^js touchid)
+      (.then #(callback (or (keyword %) android-default-support)))
+      (.catch #(callback nil))))
+
+(defn authenticate
+  [{:keys [on-success on-fail reason options]}]
+  (-> (.authenticate ^js touchid reason (clj->js options))
+      (.then #(when on-success (on-success %)))
+      (.catch #(when on-fail (on-fail (aget % "code"))))))
@@ -2,8 +2,9 @@
  (:require
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
-    [react-native.biometrics :as biometrics]
+    [react-native.async-storage :as async-storage]
    [react-native.platform :as platform]
+    [react-native.touch-id :as touch-id]
    [status-im.common.keychain.events :as keychain]
    [status-im.constants :as constants]
    [taoensso.timbre :as log]
@@ -11,19 +12,27 @@
    [utils.re-frame :as rf]))

 (def android-device-blacklisted?
-  (and platform/android? (= (:brand (native-module/get-device-model-info)) "bannedbrand")))
+  (= (:brand (native-module/get-device-model-info)) "bannedbrand"))
+
+(defn get-supported-type
+  [callback]
+  (cond platform/ios?     (touch-id/get-supported-type callback)
+        platform/android? (if android-device-blacklisted?
+                            (callback nil)
+                            (touch-id/get-supported-type callback))
+        :else             (callback nil)))

 (defn get-label-by-type
  [biometric-type]
  (condp = biometric-type
-    constants/biometrics-type-android (i18n/label :t/biometric-fingerprint)
-    constants/biometrics-type-face-id (i18n/label :t/biometric-faceid)
+    :fingerprint (i18n/label :t/biometric-fingerprint)
+    :FaceID      (i18n/label :t/biometric-faceid)
    (i18n/label :t/biometric-touchid)))

 (defn get-icon-by-type
  [biometric-type]
  (condp = biometric-type
-    constants/biometrics-type-face-id :i/face-id
+    :FaceID :i/face-id
    :i/touch-id))

 (re-frame/reg-fx
@@ -32,10 +41,8 @@
   ;;NOTE: if we can't save user password, we can't use biometric
   (keychain/can-save-user-password?
    (fn [can-save?]
-      (when (and can-save? (not android-device-blacklisted?))
-        (-> (biometrics/get-supported-type)
-            (.then (fn [type]
-                     (rf/dispatch [:biometric/get-supported-biometric-type-success type])))))))))
+      (when can-save?
+        (get-supported-type #(rf/dispatch [:biometric/get-supported-biometric-type-success %])))))))

 (rf/defn get-supported-biometric-auth-success
  {:events [:biometric/get-supported-biometric-type-success]}
@@ -44,32 +51,82 @@

 (rf/defn show-message
  {:events [:biometric/show-message]}
-  [_ error]
-  (let [code    (ex-cause error)
-        content (if (#{::biometrics/not-enrolled
-                       ::biometrics/not-available}
-                     code)
-                  (i18n/label :t/grant-face-id-permissions)
-                  (i18n/label :t/biometric-auth-error {:code code}))]
-    {:effects.utils/show-popup
-     {:title   (i18n/label :t/biometric-auth-login-error-title)
-      :content content}}))
+  [_ code]
+  (let [handle-error? (and code
+                           (not (contains? #{constants/biometric-error-user-canceled
+                                             constants/biometric-error-user-fallback}
+                                           code)))
+        content       (if (#{constants/biometric-error-not-available
+                             constants/biometric-error-not-enrolled}
+                           code)
+                        (i18n/label :t/grant-face-id-permissions)
+                        (i18n/label :t/biometric-auth-error {:code code}))]
+    (when handle-error?
+      {:effects.utils/show-popup
+       {:title   (i18n/label :t/biometric-auth-login-error-title)
+        :content content}})))

+(defn- supress-biometry-error-key
+  [key-uid]
+  (keyword (str "biometric/supress-not-enrolled-error-" key-uid)))
+
+;; NOTE: if the account had biometrics registered, but it's not enrolled at the moment,
+;; we should show the error message only once and supress further "NOT_ENROLLED" errors
+;; until biometry is enrolled again. Note that we can only know that when :biometric/authenticate
+;; is dispatched and fails with "NOT_ENROLLED", since :biometric/get-supported-biometric-type
+;; only tells us what kind of biometric is available on the device, but it doesn't know of its
+;; enrollment status.
+(re-frame/reg-fx
+ :biometric/supress-not-enrolled-error
+ (fn [[key-uid dispatch-event]]
+   (let [storage-key (supress-biometry-error-key key-uid)]
+     (-> (async-storage/get-item storage-key identity)
+         (.then (fn [item]
+                  (when (not item)
+                    (rf/dispatch dispatch-event)
+                    (async-storage/set-item! storage-key true))))
+         (.catch (fn [err]
+                   (log/error "Couldn't supress biometry NOT_ENROLLED error"
+                              {:key-uid key-uid
+                               :event   :biometric/supress-not-enrolled-error
+                               :error   err})))))))
+
+;; NOTE: when biometrics is re-enrolled, we erase the flag in async-storage to assure
+;; the "NOT_ENROLLED" error message will be shown again if biometrics is un-enrolled
+;; in the future.
+(re-frame/reg-fx
+ :biometric/reset-not-enrolled-error
+ (fn [key-uid]
+   (let [storage-key (supress-biometry-error-key key-uid)]
+     (-> (async-storage/get-item storage-key identity)
+         (.then (fn [supress?]
+                  (when supress?
+                    (async-storage/set-item! storage-key nil))))
+         (.catch (fn [err]
+                   (log/error "Couldn't reset supressing biometry NOT_ENROLLED error"
+                              {:key-uid key-uid
+                               :event   :biometric/reset-not-enrolled-error
+                               :error   err})))))))

 (re-frame/reg-fx
 :biometric/authenticate
- (fn [{:keys [on-success on-fail prompt-message]}]
-   (-> (biometrics/authenticate
-        {:prompt-message          (or prompt-message (i18n/label :t/biometric-auth-reason-login))
-         :fallback-prompt-message (i18n/label
-                                   :t/biometric-auth-login-ios-fallback-label)
-         :cancel-button-text      (i18n/label :t/cancel)})
-       (.then (fn [not-canceled?]
-                (when (and on-success not-canceled?)
-                  (on-success))))
-       (.catch (fn [err]
-                 (when on-fail
-                   (on-fail err)))))))
+ (fn [options]
+   (touch-id/authenticate
+    (merge
+     {:reason  (i18n/label :t/biometric-auth-reason-login)
+      :options (merge
+                {:unifiedErrors true}
+                (when platform/ios?
+                  {:passcodeFallback false
+                   :fallbackLabel    (i18n/label :t/biometric-auth-login-ios-fallback-label)})
+                (when platform/android?
+                  {:title                  (i18n/label :t/biometric-auth-android-title)
+                   :imageColor             :blue
+                   :imageErrorColor        :red
+                   :sensorDescription      (i18n/label :t/biometric-auth-android-sensor-desc)
+                   :sensorErrorDescription (i18n/label :t/biometric-auth-android-sensor-error-desc)
+                   :cancelText             (i18n/label :t/cancel)}))}
+     options))))

 (rf/defn authenticate
  {:events [:biometric/authenticate]}
@@ -98,23 +155,3 @@
   (let [key-uid (get-in db [:profile/profile :key-uid])]
     {:db                           (assoc db :auth-method constants/auth-method-none)
      :keychain/clear-user-password key-uid})))
-
-(rf/reg-fx
- :biometric/check-if-available
- (fn [[key-uid callback]]
-   (keychain/can-save-user-password?
-    (fn [can-save?]
-      (when can-save?
-        (-> (biometrics/get-available)
-            (.then (fn [available?]
-                     (when-not available?
-                       (throw (js/Error. "biometric-not-available")))))
-            (.then #(keychain/get-auth-method! key-uid))
-            (.then (fn [auth-method]
-                     (when auth-method (callback auth-method))))
-            (.catch (fn [err]
-                      (when-not (= (.-message err) "biometric-not-available")
-                        (log/error "Failed to check if biometrics is available"
-                                   {:error   err
-                                    :key-uid key-uid
-                                    :event   :profile.login/check-biometric}))))))))))
@@ -70,13 +70,17 @@
  {:db                        (assoc db :auth-method method)
   :keychain/save-auth-method [key-uid method]})

-(defn get-auth-method!
-  [key-uid]
-  (-> (str key-uid "-auth")
-      (keychain/get-credentials)
-      (.then (fn [value]
-               (if value (oops/oget value "password") auth-method-none)))
-      (.catch (constantly auth-method-none))))
+(re-frame/reg-fx
+ :keychain/get-auth-method
+ (fn [[key-uid callback]]
+   (can-save-user-password?
+    (fn [can-save?]
+      (if can-save?
+        (keychain/get-credentials
+         (str key-uid "-auth")
+         (fn [value]
+           (callback (if value (oops/oget value "password") auth-method-none))))
+        (callback nil))))))

 (defn save-user-password!
  [key-uid password]
@@ -97,7 +101,7 @@
   (get-user-password! key-uid callback)))

 (rf/defn get-user-password
-  [_ [key-uid callback]]
+  [_ key-uid callback]
  {:keychain/get-user-password [key-uid callback]})

 (defn- password-migration-key-name
@@ -1,37 +0,0 @@
-(ns status-im.common.lightbox.events
-  (:require [reagent.core :as reagent]
-            status-im.common.lightbox.effects
-            [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :lightbox/navigate-to-lightbox
- (fn [{:keys [db]} [animation-shared-element-id screen-params]]
-   (reagent/next-tick #(rf/dispatch [:navigate-to :lightbox screen-params]))
-   {:db (assoc db :animation-shared-element-id animation-shared-element-id)}))
-
-(rf/reg-event-fx :lightbox/update-animation-shared-element-id
- (fn [{:keys [db]} [animation-shared-element-id]]
-   {:db (assoc db :animation-shared-element-id animation-shared-element-id)}))
-
-(rf/reg-event-fx :lightbox/exit-lightbox-signal
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/exit-signal value)}))
-
-(rf/reg-event-fx :lightbox/zoom-out-signal
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/zoom-out-signal value)}))
-
-(rf/reg-event-fx :lightbox/orientation-change
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/orientation value)}))
-
-(rf/reg-event-fx :lightbox/lightbox-scale
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/scale value)}))
-
-(rf/reg-event-fx :lightbox/share-image
- (fn [_ [uri]]
-   {:effects.lightbox/share-image uri}))
-
-(rf/reg-event-fx :lightbox/save-image-to-gallery
- (fn [_ [uri on-success]]
-   {:effects.lightbox/save-image-to-gallery [uri on-success]}))
@@ -4,7 +4,6 @@
    [quo.core :as quo]
    [react-native.core :as rn]
    [react-native.reanimated :as reanimated]
-    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
    [status-im.common.scroll-page.style :as style]
    [utils.re-frame :as rf]))
@@ -60,7 +59,7 @@
        [rn/view {:style {:margin-top 0}}
         top-nav]
        [quo/page-nav
-         (cond-> {:margin-top     (safe-area/get-top)
+         (cond-> {:margin-top     44
                  :type           :no-title
                  :background     (if (= 1 (reanimated/get-shared-value opacity-animation))
                                    :blur
@@ -1,6 +1,6 @@
 (ns status-im.common.standard-authentication.standard-auth.authorize
  (:require
-    [react-native.biometrics :as biometrics]
+    [react-native.touch-id :as biometric]
    [status-im.common.standard-authentication.enter-password.view :as enter-password]
    [taoensso.timbre :as log]
    [utils.i18n :as i18n]
@@ -39,29 +39,25 @@
        ; to retrigger biometric auth, so they can endlessly repeat this cycle.
        biometrics-login    (fn [on-press-biometrics]
                              (rf/dispatch [:dismiss-keyboard])
-                              (rf/dispatch
-                               [:biometric/authenticate
-                                {:prompt-message (i18n/label :t/biometric-auth-confirm-message)
-                                 :on-success     (fn []
-                                                   (on-close)
-                                                   (rf/dispatch [:standard-auth/on-biometric-success
-                                                                 (handle-auth-success true)]))
-                                 :on-fail        (fn [error]
-                                                   (on-close)
-                                                   (log/error
-                                                    (ex-message error)
-                                                    (-> error ex-data (assoc :code (ex-cause error))))
-                                                   (when on-auth-fail (on-auth-fail error))
-                                                   (password-login {:on-press-biometrics
-                                                                    #(on-press-biometrics
-                                                                      on-press-biometrics)}))}]))]
+                              (biometric/authenticate
+                               {:reason     (i18n/label :t/biometric-auth-confirm-message)
+                                :on-success (fn [_response]
+                                              (on-close)
+                                              (rf/dispatch [:standard-auth/on-biometric-success
+                                                            (handle-auth-success true)]))
+                                :on-fail    (fn [error]
+                                              (on-close)
+                                              (log/error "Authentication Failed. Error:" error)
+                                              (when on-auth-fail (on-auth-fail error))
+                                              (password-login {:on-press-biometrics
+                                                               #(on-press-biometrics
+                                                                 on-press-biometrics)}))}))]
    (if biometric-auth?
-      (-> (biometrics/get-supported-type)
-          (.then (fn [biometric-type]
-                   (if biometric-type
-                     (biometrics-login biometrics-login)
-                     (do
-                       (reset-password)
-                       (password-login {})))))
-          (.catch #(password-login {})))
+      (biometric/get-supported-type
+       (fn [biometric-type]
+         (if biometric-type
+           (biometrics-login biometrics-login)
+           (do
+             (reset-password)
+             (password-login {})))))
      (password-login {}))))
@@ -162,7 +162,3 @@

 (def community-accounts-selection-enabled? false)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
-
-(def wallet-feature-flags
-  {:edit-default-keypair false
-   :bridge-token         false})
@@ -378,10 +378,10 @@
 (def ^:const auth-method-biometric-prepare "biometric-prepare")
 (def ^:const auth-method-none "none")

-;; NOTE all android biometrics falls under :Biometrics
-(def ^:const biometrics-type-android :Biometrics)
-(def ^:const biometrics-type-touch-id :TouchID)
-(def ^:const biometrics-type-face-id :FaceID)
+(def ^:const biometric-error-user-canceled "USER_CANCELED")
+(def ^:const biometric-error-user-fallback "USER_USER_FALLBACK")
+(def ^:const biometric-error-not-available "NOT_AVAILABLE")
+(def ^:const biometric-error-not-enrolled "NOT_ENROLLED")

 (def ^:const onboarding-generating-keys-animation-duration-ms 7000)
 (def ^:const onboarding-generating-keys-navigation-retry-ms 3000)
@@ -4,12 +4,13 @@
    [legacy.status-im.chat.models.loading :as loading]
    [legacy.status-im.data-store.chats :as chats-store]
    [re-frame.core :as re-frame]
-    status-im.common.lightbox.events
+    [reagent.core :as reagent]
    [status-im.common.muting.helpers :refer [format-mute-till]]
    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    status-im.contexts.chat.effects
    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
+    status-im.contexts.chat.messenger.lightbox.events
    status-im.contexts.chat.messenger.messages.content.reactions.events
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
@@ -393,6 +394,38 @@
  [cofx chat-id]
  (navigation/navigate-to cofx :chat-pinned-messages {:chat-id chat-id}))

+
+(rf/defn update-shared-element-id
+  {:events [:chat.ui/update-shared-element-id]}
+  [{:keys [db]} shared-element-id]
+  {:db (assoc db :shared-element-id shared-element-id)})
+
+(rf/defn navigate-to-lightbox
+  {:events [:chat.ui/navigate-to-lightbox]}
+  [{:keys [db]} shared-element-id screen-params]
+  (reagent/next-tick #(rf/dispatch [:navigate-to :lightbox screen-params]))
+  {:db (assoc db :shared-element-id shared-element-id)})
+
+(rf/defn exit-lightbox-signal
+  {:events [:chat.ui/exit-lightbox-signal]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/exit-signal value)})
+
+(rf/defn zoom-out-signal
+  {:events [:chat.ui/zoom-out-signal]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/zoom-out-signal value)})
+
+(rf/defn orientation-change
+  {:events [:chat.ui/orientation-change]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/orientation value)})
+
+(rf/defn lightbox-scale
+  {:events [:chat.ui/lightbox-scale]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/scale value)})
+
 (rf/defn check-last-chat
  {:events [:chat/check-last-chat]}
  [{:keys [db]}]
@@ -419,15 +452,3 @@
  {:events [:chat.ui/scroll-to-bottom]}
  [_]
  {:effects.chat/scroll-to-bottom nil})
-
-(rf/reg-event-fx :chat.ui/clear-sending-images
- (fn [{:keys [db]}]
-   {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})}))
-
-(rf/reg-event-fx :chat.ui/image-unselected
- (fn [{:keys [db]} [original]]
-   (let [current-chat-id (:current-chat-id db)]
-     {:db (update-in db
-                     [:chat/inputs current-chat-id :metadata :sending-image]
-                     dissoc
-                     (:uri original))})))
@@ -127,8 +127,9 @@
 (defn change-text
  "Update `text-value`, update cursor selection, find links, find mentions"
  [text
-   {:keys [input-ref record-reset-fn]}
-   {:keys [text-value cursor-position recording?]}]
+   {:keys [input-ref record-reset-fn] :as props}
+   {:keys [text-value cursor-position recording?]}
+   scroll-to-end]
  (reset! text-value text)
  (reagent/next-tick #(when @input-ref
                        (.setNativeProps ^js @input-ref
@@ -140,6 +141,8 @@
  (rf/dispatch [:chat.ui/set-chat-input-text text])
  (debounce/debounce-and-dispatch [:link-preview/unfurl-urls text]
                                  constants/unfurl-debounce-ms)
+  (when (string/ends-with? text (with-out-str (newline)))
+    (scroll-to-end props))
  (if (string/ends-with? text "@")
    (rf/dispatch [:mention/on-change-text text])
    (debounce/debounce-and-dispatch [:mention/on-change-text text] 300)))
@@ -69,17 +69,11 @@
   :min-height constants/input-height})

 (defn input-text
-  [{:keys [saved-emoji-kb-extra-height]}
-   {:keys [focused? maximized?]}
-   {:keys [max-height theme]}]
+  [{:keys [maximized?]}
+   {:keys [theme]}]
  (assoc typography/paragraph-1
         :color               (colors/theme-colors :black :white theme)
         :text-align-vertical :top
-         :position            (if @saved-emoji-kb-extra-height :relative :absolute)
-         :top                 0
-         :left                0
-         :right               (when (or focused? platform/ios?) 0)
-         :max-height          max-height
         :padding-bottom      (when @maximized? 0)))

 (defn background
@@ -175,7 +175,8 @@
   :record-reset-fn             (atom nil)
   :scroll-y                    (atom 0)
   :selection-event             (atom nil)
-   :selection-manager           (rn/selectable-text-input-manager)})
+   :selection-manager           (rn/selectable-text-input-manager)
+   :composer-scrollview-ref     (atom nil)})

 (defn init-reactive-state
  []
@@ -68,7 +68,14 @@
        ;; Cursor position, needed to determine where to display the mentions view
        cursor-pos               (utils/cursor-y-position-relative-to-container
                                  props
-                                  state)]
+                                  state)
+        scroll-to-end            (fn []
+                                   ;; Needs to be queued, Otherwise might not be called on the right
+                                   ;; time.
+                                   (js/setTimeout #(when @(:composer-scrollview-ref props)
+                                                     (.scrollToEnd @(:composer-scrollview-ref props)))
+                                                  50))
+        chat-screen-loaded?      (rf/sub [:shell/chat-screen-loaded?])]
    (effects/did-mount props)
    (effects/initialize props
                        state
@@ -90,8 +97,7 @@
      {:style style/composer-sheet-and-jump-to-container}
      [sub-view/shell-button state chat-list-scroll-y window-height]
      [gesture/gesture-detector
-       {:gesture
-        (drag-gesture/drag-gesture props state animations dimensions keyboard-shown)}
+       {:gesture (drag-gesture/drag-gesture props state animations dimensions keyboard-shown)}
       [reanimated/view
        {:style     (style/sheet-container insets state animations theme)
         :on-layout #(handler/layout % state blur-height)}
@@ -112,36 +118,43 @@
          {:ref        #(reset! (:selectable-input-ref props) %)
           :menu-items @(:menu-items state)
           :style      (style/input-view state)}
-          [rn/text-input
-           {:ref                      #(reset! (:input-ref props) %)
-            :default-value            @(:text-value state)
-            :on-focus                 #(handler/focus props state animations dimensions)
-            :on-blur                  #(handler/blur state animations dimensions subscriptions)
-            :on-content-size-change   #(handler/content-size-change %
-                                                                    state
-                                                                    animations
-                                                                    dimensions
-                                                                    (or keyboard-shown
-                                                                        (:edit subscriptions)))
-            :on-scroll                #(handler/scroll % props state animations dimensions)
-            :on-change-text           #(handler/change-text % props state)
-            :on-selection-change      #(handler/selection-change % props state)
-            :on-selection             #(selection/on-selection % props state)
-            :keyboard-appearance      (quo.theme/theme-value :light :dark)
-            :max-font-size-multiplier 1
-            :multiline                true
-            :placeholder              (i18n/label :t/type-something)
-            :placeholder-text-color   (colors/theme-colors colors/neutral-40 colors/neutral-50)
-            :style                    (style/input-text props
-                                                        state
-                                                        {:max-height max-height
-                                                         :theme      theme})
-            :max-length               constants/max-text-size
-            :accessibility-label      :chat-message-input}]]]
-        [:<>
-         [gradients/view props state animations show-bottom-gradient?]
-         [link-preview/view]
-         [images/images-list]]
+          ;; https://github.com/facebook/react-native/issues/39660
+          [rn/scroll-view
+           {:on-scroll                       #(handler/scroll % props state animations dimensions)
+            :keyboard-should-persist-taps    :handled
+            :scroll-event-throttle           64
+            :ref                             #(reset! (:composer-scrollview-ref props) %)
+            :shows-vertical-scroll-indicator false}
+           [rn/text-input
+            {:ref                      #(reset! (:input-ref props) %)
+             :default-value            @(:text-value state)
+             :on-focus                 #(handler/focus props state animations dimensions)
+             :on-blur                  #(handler/blur state animations dimensions subscriptions)
+             :on-change-text           #(handler/change-text % props state scroll-to-end)
+             :on-selection-change      #(handler/selection-change % props state)
+             :on-content-size-change   #(handler/content-size-change %1
+                                                                     state
+                                                                     animations
+                                                                     dimensions
+                                                                     (or keyboard-shown
+                                                                         (:edit subscriptions)))
+             :on-selection             #(selection/on-selection % props state)
+             :keyboard-appearance      (quo.theme/theme-value :light :dark)
+             :max-font-size-multiplier 1
+             :multiline                true
+             :scroll-enabled           false
+             :placeholder              (i18n/label :t/type-something)
+             :placeholder-text-color   (colors/theme-colors colors/neutral-40 colors/neutral-50)
+             :style                    (style/input-text state
+                                                         {:max-height max-height
+                                                          :theme      theme})
+             :max-length               constants/max-text-size
+             :accessibility-label      :chat-message-input}]]]]
+        (when chat-screen-loaded?
+          [:<>
+           [gradients/view props state animations show-bottom-gradient?]
+           [link-preview/view]
+           [images/images-list]])
        [:f> actions/view props state animations window-height insets subscriptions]]]]]))

 (defn f-composer
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.animations
+(ns status-im.contexts.chat.messenger.lightbox.animations
  (:require
    [react-native.reanimated :as reanimated]))

@@ -1,25 +1,25 @@
-(ns status-im.common.lightbox.bottom-view
+(ns status-im.contexts.chat.messenger.lightbox.bottom-view
  (:require
    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
-    [status-im.common.lightbox.text-sheet.view :as text-sheet]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.view :as text-sheet]
    [utils.re-frame :as rf]))

 (defn get-small-item-layout
  [_ index]
  #js
-   {:length constants/small-image-size
-    :offset (* (+ constants/small-image-size 8) index)
+   {:length c/small-image-size
+    :offset (* (+ c/small-image-size 8) index)
    :index  index})

 (defn- f-small-image
  [item index _ {:keys [scroll-index props]}]
-  (let [size (if (= @scroll-index index) constants/focused-image-size constants/small-image-size)
+  (let [size (if (= @scroll-index index) c/focused-image-size c/small-image-size)
        size-value (anim/use-val size)
        {:keys [scroll-index-lock? small-list-ref flat-list-ref]}
        props]
@@ -27,7 +27,7 @@
    [rn/touchable-opacity
     {:active-opacity 1
      :on-press       (fn []
-                        (rf/dispatch [:lightbox/zoom-out-signal @scroll-index])
+                        (rf/dispatch [:chat.ui/zoom-out-signal @scroll-index])
                        (reset! scroll-index-lock? true)
                        (js/setTimeout #(reset! scroll-index-lock? false) 500)
                        (js/setTimeout
@@ -38,9 +38,9 @@
                           (.scrollToIndex ^js @flat-list-ref
                                           #js {:animated true :index index}))
                         (if platform/ios? 50 150))
-                        (rf/dispatch [:lightbox/update-animation-shared-element-id (:id item)]))}
+                        (rf/dispatch [:chat.ui/update-shared-element-id (:message-id item)]))}
     [reanimated/fast-image
-      {:source {:uri (:image item)}
+      {:source {:uri (:image (:content item))}
       :style  (reanimated/apply-animations-to-style {:width  size-value
                                                      :height size-value}
                                                     {:border-radius 10})}]]))
@@ -50,26 +50,20 @@
  [:f> f-small-image item index _ render-data])

 (defn bottom-view
-  [{:keys [images index scroll-index insets animations derived item-width props state transparent?
-           bottom-text-component]}]
-  (let [padding-horizontal (- (/ item-width 2) (/ constants/focused-image-size 2))]
+  [messages index scroll-index insets animations derived item-width props state transparent?]
+  (let [padding-horizontal (- (/ item-width 2) (/ c/focused-image-size 2))]
    [reanimated/linear-gradient
     {:colors   [colors/neutral-100-opa-100 colors/neutral-100-opa-80 colors/neutral-100-opa-0]
      :location [0.2 0.9]
      :start    {:x 0 :y 1}
      :end      {:x 0 :y 0}
      :style    (style/gradient-container insets animations derived transparent?)}
-     (when bottom-text-component
-       [text-sheet/view
-        {:overlay-opacity  (:overlay-opacity animations)
-         :overlay-z-index  (:overlay-z-index state)
-         :text-sheet-lock? (:text-sheet-lock? props)
-         :text-component   bottom-text-component}])
+     [text-sheet/view messages animations state props]
     [rn/flat-list
      {:ref                               #(reset! (:small-list-ref props) %)
-       :key-fn                            :id
-       :style                             {:height constants/small-list-height}
-       :data                              images
+       :key-fn                            :message-id
+       :style                             {:height c/small-list-height}
+       :data                              messages
       :render-fn                         small-image
       :render-data                       {:scroll-index scroll-index
                                           :props        props}
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.constants)
+(ns status-im.contexts.chat.messenger.lightbox.constants)

 (def ^:const small-image-size 40)
 (def ^:const focused-extra-size 16)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.effects
+(ns status-im.contexts.chat.messenger.lightbox.effects
  (:require [react-native.blob :as blob]
            [react-native.cameraroll :as cameraroll]
            [react-native.fs :as fs]
@@ -10,7 +10,7 @@
  {:trusty platform/ios?
   :path   (str (fs/cache-dir) "/StatusIm_Image.jpeg")})

-(rf/reg-fx :effects.lightbox/share-image
+(rf/reg-fx :effects.chat/share-image
 (fn [uri]
   (blob/fetch uri
               config
@@ -20,7 +20,7 @@
                             #(fs/unlink downloaded-url)
                             #(fs/unlink downloaded-url))))))

-(rf/reg-fx :effects.lightbox/save-image-to-gallery
+(rf/reg-fx :effects.chat/save-image-to-gallery
 (fn [[uri on-success]]
   (blob/fetch uri
               config
@@ -0,0 +1,23 @@
+(ns status-im.contexts.chat.messenger.lightbox.events
+  (:require status-im.contexts.chat.messenger.lightbox.effects
+            [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :chat.ui/clear-sending-images
+ (fn [{:keys [db]}]
+   {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})}))
+
+(rf/reg-event-fx :chat.ui/image-unselected
+ (fn [{:keys [db]} [original]]
+   (let [current-chat-id (:current-chat-id db)]
+     {:db (update-in db
+                     [:chat/inputs current-chat-id :metadata :sending-image]
+                     dissoc
+                     (:uri original))})))
+
+(rf/reg-event-fx :chat.ui/share-image
+ (fn [_ [uri]]
+   {:effects.chat/share-image uri}))
+
+(rf/reg-event-fx :chat.ui/save-image-to-gallery
+ (fn [_ [uri on-success]]
+   {:effects.chat/save-image-to-gallery [uri on-success]}))
@@ -1,9 +1,9 @@
-(ns status-im.common.lightbox.style
+(ns status-im.contexts.chat.messenger.lightbox.style
  (:require
    [quo.foundations.colors :as colors]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]))

 ;;;; VIEW
 (defn image
@@ -33,7 +33,7 @@
   {:position           :absolute
    :padding-horizontal 20
    :top                (if (or platform/ios? (not landscape?)) top-inset 0)
-    :height             constants/top-view-height
+    :height             c/top-view-height
    :z-index            4
    :flex-direction     :row
    :justify-content    :space-between
@@ -44,7 +44,7 @@
 (defn top-gradient
  [insets]
  {:position :absolute
-   :height   (+ constants/top-view-height (:top insets) 0)
+   :height   (+ c/top-view-height (:top insets) 0)
   :top      (- (:top insets))
   :left     0
   :right    0})
@@ -71,12 +71,12 @@
    :display        (if @transparent? :none :flex)
    :bottom         0
    :padding-bottom (:bottom insets)
-    :padding-top    constants/text-min-height
+    :padding-top    c/text-min-height
    :z-index        3}))

 (defn content-container
  [padding-horizontal]
-  {:padding-vertical   constants/small-list-padding-vertical
+  {:padding-vertical   c/small-list-padding-vertical
   :padding-horizontal padding-horizontal
   :align-items        :center
   :justify-content    :center})
@@ -1,8 +1,8 @@
-(ns status-im.common.lightbox.text-sheet.style
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.style
  (:require
    [quo.foundations.colors :as colors]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))

 (defn sheet-container
  [{:keys [height top]}]
@@ -14,10 +14,10 @@
    :right    0}))

 (defn text-style
-  [expandable-text?]
+  [expanding-message?]
  {:color             colors/white
   :margin-horizontal 20
-   :align-items       (when-not expandable-text? :center)
+   :align-items       (when-not expanding-message? :center)
   :flex-grow         1})

 (def bar-container
@@ -1,10 +1,10 @@
-(ns status-im.common.lightbox.text-sheet.utils
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.utils
  (:require
    [oops.core :as oops]
    [react-native.gesture :as gesture]
    [react-native.reanimated :as reanimated]
    [reagent.core :as r]
-    [status-im.common.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))

 (defn- collapse-sheet
  [{:keys [derived-value overlay-opacity saved-top expanded? overlay-z-index]}]
@@ -16,10 +16,10 @@

 (defn sheet-gesture
  [{:keys [derived-value saved-top overlay-opacity gradient-opacity]}
-   expanded-height max-height full-height overlay-z-index expanded? dragging? expandable-text?]
+   expanded-height max-height full-height overlay-z-index expanded? dragging? expanding-message?]
  (let [disable-gesture-update (r/atom false)]
    (-> (gesture/gesture-pan)
-        (gesture/enabled expandable-text?)
+        (gesture/enabled expanding-message?)
        (gesture/on-start (fn []
                            (reset! overlay-z-index 1)
                            (reset! dragging? true)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.text-sheet.view
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.view
  (:require
    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
@@ -8,31 +8,33 @@
    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.text-sheet.style :as style]
-    [status-im.common.lightbox.text-sheet.utils :as utils]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.utils :as utils]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))

 (defn- text-sheet
-  [_]
+  [messages overlay-opacity overlay-z-index text-sheet-lock?]
  (let [text-height (reagent/atom 0)
        expanded?   (reagent/atom false)
        dragging?   (atom false)]
-    (fn [{:keys [overlay-opacity overlay-z-index text-sheet-lock? text-component]}]
-      (let [insets           (safe-area/get-insets)
-            window-height    (:height (rn/get-window))
-            max-height       (- window-height
-                                constants/text-min-height
-                                constants/top-view-height
-                                (:bottom insets)
-                                (when platform/ios? (:top insets)))
-            full-height      (+ constants/bar-container-height
-                                constants/text-margin
-                                constants/line-height
-                                @text-height)
-            expanded-height  (min max-height full-height)
-            animations       (utils/init-animations overlay-opacity)
-            derived          (utils/init-derived-animations animations)
-            expandable-text? (> @text-height (* constants/line-height 2))]
+    (fn []
+      (let [{:keys [chat-id content]} (first messages)
+            insets                    (safe-area/get-insets)
+            window-height             (:height (rn/get-window))
+            max-height                (- window-height
+                                         constants/text-min-height
+                                         constants/top-view-height
+                                         (:bottom insets)
+                                         (when platform/ios? (:top insets)))
+            full-height               (+ constants/bar-container-height
+                                         constants/text-margin
+                                         constants/line-height
+                                         @text-height)
+            expanded-height           (min max-height full-height)
+            animations                (utils/init-animations overlay-opacity)
+            derived                   (utils/init-derived-animations animations)
+            expanding-message?        (> @text-height (* constants/line-height 2))]
        [rn/view
         [reanimated/linear-gradient
          {:colors         [colors/neutral-100-opa-0 colors/neutral-100]
@@ -49,10 +51,10 @@
                                         overlay-z-index
                                         expanded?
                                         dragging?
-                                         expandable-text?)}
+                                         expanding-message?)}
          [gesture/gesture-detector
           {:gesture (-> (gesture/gesture-tap)
-                         (gesture/enabled (and expandable-text? (not @expanded?)))
+                         (gesture/enabled (and expanding-message? (not @expanded?)))
                         (gesture/on-start (fn []
                                             (utils/expand-sheet animations
                                                                 expanded-height
@@ -61,7 +63,7 @@
                                                                 expanded?
                                                                 text-sheet-lock?))))}
           [reanimated/view {:style (style/sheet-container derived)}
-            (when expandable-text?
+            (when expanding-message?
              [rn/view {:style style/bar-container}
               [rn/view {:style style/bar}]])
            [linear-gradient/linear-gradient
@@ -70,17 +72,19 @@
              :end       {:x 0 :y 0}
              :locations [0.7 0.8 1]
              :style     (style/bottom-gradient (:bottom insets))}]
-
            [gesture/scroll-view
             {:scroll-enabled          false
              :scroll-event-throttle   16
              :bounces                 false
              :style                   {:height (- max-height constants/bar-container-height)}
-              :content-container-style {:padding-top (when (not expandable-text?)
+              :content-container-style {:padding-top (when (not expanding-message?)
                                                       constants/bar-container-height)}}
-             [rn/view {:on-layout #(utils/on-layout % text-height)}
-              text-component]]]]]]))))
+             [message-view/render-parsed-text
+              {:content        content
+               :chat-id        chat-id
+               :style-override (style/text-style expanding-message?)
+               :on-layout      #(utils/on-layout % text-height)}]]]]]]))))

 (defn view
-  [props]
-  [:f> text-sheet props])
+  [messages {:keys [overlay-opacity]} {:keys [overlay-z-index]} {:keys [text-sheet-lock?]}]
+  [:f> text-sheet messages overlay-opacity overlay-z-index text-sheet-lock?])
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.top-view
+(ns status-im.contexts.chat.messenger.lightbox.top-view
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
@@ -6,9 +6,10 @@
    [react-native.orientation :as orientation]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [utils.datetime :as datetime]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -16,7 +17,7 @@
 (defn animate-rotation
  [result screen-width screen-height insets
   {:keys [rotate top-view-y top-view-x top-view-width top-view-bg]}]
-  (let [top-x (+ (/ constants/top-view-height 2) (:top insets))]
+  (let [top-x (+ (/ c/top-view-height 2) (:top insets))]
    (cond
      (= result orientation/landscape-left)
      (do
@@ -41,9 +42,9 @@
        (anim/animate top-view-bg colors/neutral-100-opa-0)))))

 (defn drawer
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
+  [messages index]
+  (let [{:keys [content]} (nth messages index)
+        uri               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
    [quo/action-drawer
     [[{:icon                :i/save
        :accessibility-label :save-image
@@ -51,7 +52,7 @@
        :on-press            (fn []
                               (rf/dispatch [:hide-bottom-sheet])
                               (rf/dispatch
-                                [:lightbox/save-image-to-gallery
+                                [:chat.ui/save-image-to-gallery
                                 uri
                                 #(rf/dispatch [:toasts/upsert
                                                {:id              :random-id
@@ -60,19 +61,20 @@
                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))

 (defn share-image
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
-    (rf/dispatch [:lightbox/share-image uri])))
+  [messages index]
+  (let [{:keys [content]} (nth messages index)
+        uri               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
+    (rf/dispatch [:chat.ui/share-image uri])))

 (defn top-view
-  [images insets index animations derived landscape? screen-width]
-  (let [{:keys [description header]} (nth images @index)
-        bg-color                     (if landscape?
-                                       colors/neutral-100-opa-70
-                                       colors/neutral-100-opa-0)
+  [messages insets index animations derived landscape? screen-width]
+  (let [{:keys [from timestamp]}  (first messages)
+        [primary-name _]          (rf/sub [:contacts/contact-two-names-by-identity from])
+        bg-color                  (if landscape?
+                                    colors/neutral-100-opa-70
+                                    colors/neutral-100-opa-0)
        {:keys [background-color opacity
-                overlay-opacity]}    animations]
+                overlay-opacity]} animations]
    [reanimated/view
     {:style
      (style/top-view-container (:top insets) screen-width bg-color landscape? animations derived)}
@@ -90,7 +92,7 @@
                    (anim/animate opacity 0)
                    (anim/animate overlay-opacity 0)
                    (rf/dispatch (if platform/ios?
-                                   [:lightbox/exit-lightbox-signal @index]
+                                   [:chat.ui/exit-lightbox-signal @index]
                                   [:navigate-back])))
        :style    style/close-container}
       [quo/icon :close {:size 20 :color colors/white}]]
@@ -98,22 +100,22 @@
       [quo/text
        {:weight :semi-bold
         :size   :paragraph-1
-         :style  {:color colors/white}} header]
+         :style  {:color colors/white}} primary-name]
       [quo/text
        {:weight :medium
         :size   :paragraph-2
-         :style  {:color colors/neutral-40}} description]]]
+         :style  {:color colors/neutral-40}} (when timestamp (datetime/to-short-str timestamp))]]]
     [rn/view {:style style/top-right-buttons}
      [rn/touchable-opacity
       {:active-opacity      1
        :accessibility-label :share-image
-        :on-press            #(share-image images @index)
+        :on-press            #(share-image messages @index)
        :style               (merge style/close-container {:margin-right 12})}
       [quo/icon :share {:size 20 :color colors/white}]]
      [rn/touchable-opacity
       {:active-opacity      1
        :accessibility-label :image-options
        :on-press            #(rf/dispatch [:show-bottom-sheet
-                                            {:content (fn [] [drawer images @index])}])
+                                            {:content (fn [] [drawer messages @index])}])
        :style               style/close-container}
       [quo/icon :options {:size 20 :color colors/white}]]]]))
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.utils
+(ns status-im.contexts.chat.messenger.lightbox.utils
  (:require
    [clojure.string :as string]
    [oops.core :as oops]
@@ -9,9 +9,9 @@
    [react-native.platform :as platform]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
    [utils.re-frame :as rf]
    [utils.worklets.chat.messenger.lightbox :as worklet]))

@@ -46,7 +46,7 @@
                      (if platform/ios? 250 100)))
     (swap! timers assoc :mount-index-lock (js/setTimeout #(reset! scroll-index-lock? false) 300))
     (fn []
-       (rf/dispatch [:lightbox/zoom-out-signal nil])
+       (rf/dispatch [:chat.ui/zoom-out-signal nil])
       (when platform/android?
         (rf/dispatch [:chat.ui/lightbox-scale 1]))
       (clear-timers timers)))))
@@ -69,7 +69,7 @@
        landscape?    (string/includes? result orientation/landscape)
        item-width    (if (and landscape? platform/ios?) screen-height screen-width)]
    (when (or landscape? (= result orientation/portrait))
-      (rf/dispatch [:lightbox/orientation-change result]))
+      (rf/dispatch [:chat.ui/orientation-change result]))
    (cond
      landscape?
      (orientation/lock-to-landscape "lightbox")
@@ -148,11 +148,11 @@
   :timers             (atom {})})

 (defn init-state
-  [images index]
+  [messages index]
  ;; The initial value of data is the image that was pressed (and not the whole album) in order
  ;; for the transition animation to execute properly, otherwise it would animate towards
  ;; outside the screen (even if we have `initialScrollIndex` set).
-  {:data             (reagent/atom (if (number? index) [(nth images index)] []))
+  {:data             (reagent/atom (if (number? index) [(nth messages index)] []))
   :scroll-index     (reagent/atom index)
   :transparent?     (reagent/atom false)
   :set-full-height? (reagent/atom false)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.view
+(ns status-im.contexts.chat.messenger.lightbox.view
  (:require
    [clojure.string :as string]
    [oops.core :as oops]
@@ -9,13 +9,13 @@
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.bottom-view :as bottom-view]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
-    [status-im.common.lightbox.top-view :as top-view]
-    [status-im.common.lightbox.utils :as utils]
-    [status-im.common.lightbox.zoomable-image.view :as zoomable-image]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.bottom-view :as bottom-view]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.view :as zoomable-image]
    [utils.re-frame :as rf]))

 (defn get-item-layout
@@ -33,10 +33,9 @@
      (reset! scroll-index index)
      (when @small-list-ref
        (.scrollToIndex ^js @small-list-ref #js {:animated true :index index}))
-      (rf/dispatch [:lightbox/update-animation-shared-element-id
-                    (:id (oops/oget changed :item))]))))
+      (rf/dispatch [:chat.ui/update-shared-element-id (:message-id (oops/oget changed :item))]))))

-(defn image-view
+(defn image
  [message index _ {:keys [screen-width screen-height] :as args}]
  [rn/view
   {:style (style/image (+ screen-width constants/separator-width) screen-height)}
@@ -44,31 +43,30 @@
   [rn/view {:style {:width constants/separator-width}}]])

 (defn lightbox-content
-  [{:keys [props state animations derived images index handle-items-changed bottom-text-component]}]
-  (let [{:keys [data transparent? scroll-index
-                set-full-height?]} state
-        insets                     (safe-area/get-insets)
-        window                     (rn/get-window)
-        window-width               (:width window)
-        window-height              (if platform/android?
-                                     (+ (:height window) (:top insets))
-                                     (:height window))
-        curr-orientation           (or (rf/sub [:lightbox/orientation]) orientation/portrait)
-        landscape?                 (string/includes? curr-orientation orientation/landscape)
-        horizontal?                (or platform/android? (not landscape?))
-        inverted?                  (and platform/ios? (= curr-orientation orientation/landscape-right))
-        screen-width               (if (or platform/ios? (= curr-orientation orientation/portrait))
-                                     window-width
-                                     window-height)
-        screen-height              (if (or platform/ios? (= curr-orientation orientation/portrait))
-                                     window-height
-                                     window-width)
-        item-width                 (if (and landscape? platform/ios?) screen-height screen-width)]
+  [props {:keys [data transparent? scroll-index set-full-height?] :as state}
+   animations derived messages index handle-items-changed]
+  (let [insets           (safe-area/get-insets)
+        window           (rn/get-window)
+        window-width     (:width window)
+        window-height    (if platform/android?
+                           (+ (:height window) (:top insets))
+                           (:height window))
+        curr-orientation (or (rf/sub [:lightbox/orientation]) orientation/portrait)
+        landscape?       (string/includes? curr-orientation orientation/landscape)
+        horizontal?      (or platform/android? (not landscape?))
+        inverted?        (and platform/ios? (= curr-orientation orientation/landscape-right))
+        screen-width     (if (or platform/ios? (= curr-orientation orientation/portrait))
+                           window-width
+                           window-height)
+        screen-height    (if (or platform/ios? (= curr-orientation orientation/portrait))
+                           window-height
+                           window-width)
+        item-width       (if (and landscape? platform/ios?) screen-height screen-width)]
    [reanimated/view
     {:style (reanimated/apply-animations-to-style {:background-color (:background-color animations)}
                                                   {:height screen-height})}
     (when-not @transparent?
-       [:f> top-view/top-view images insets scroll-index animations derived landscape?
+       [:f> top-view/top-view messages insets scroll-index animations derived landscape?
        screen-width])
     [gesture/gesture-detector
      {:gesture (utils/drag-gesture animations (and landscape? platform/ios?) set-full-height?)}
@@ -94,7 +92,7 @@
         :scroll-event-throttle             8
         :style                             {:width (+ screen-width constants/separator-width)}
         :data                              @data
-         :render-fn                         image-view
+         :render-fn                         image
         :render-data                       {:opacity-value     (:opacity animations)
                                             :overlay-opacity   (:overlay-opacity animations)
                                             :border-value      (:border animations)
@@ -120,47 +118,26 @@
     ;; NOTE: not un-mounting bottom-view based on `transparent?` (like we do with the top-view
     ;;       above), since we need to save the state of the text-sheet position. Instead, we use
     ;;       the `:display` style property to hide the bottom-sheet.
-     (when (and (not landscape?) (or bottom-text-component (> (count images) 1)))
-       [:f> bottom-view/bottom-view
-        {:images                images
-         :index                 index
-         :scroll-index          scroll-index
-         :insets                insets
-         :animations            animations
-         :derived               derived
-         :item-width            item-width
-         :props                 props
-         :state                 state
-         :transparent?          transparent?
-         :bottom-text-component bottom-text-component}])]))
+     (when (not landscape?)
+       [:f> bottom-view/bottom-view messages index scroll-index insets animations derived
+        item-width props state transparent?])]))

 (defn- f-lightbox
  []
-  (let [{:keys [images index bottom-text-component]} (rf/sub [:get-screen-params])
-        props
-        (utils/init-props)
-        state
-        (utils/init-state images index)
-        handle-items-changed
-        (fn [e]
-          (on-viewable-items-changed e props state))]
+  (let [{:keys [messages index]} (rf/sub [:get-screen-params])
+        props                    (utils/init-props)
+        state                    (utils/init-state messages index)
+        handle-items-changed     (fn [e]
+                                   (on-viewable-items-changed e props state))]
    (fn []
-      (let [animations (utils/init-animations (count images) index)
+      (let [animations (utils/init-animations (count messages) index)
            derived    (utils/init-derived-animations animations)]
        (anim/animate (:background-color animations) colors/neutral-100)
-        (reset! (:data state) images)
+        (reset! (:data state) messages)
        (when platform/ios? ; issue: https://github.com/wix/react-native-navigation/issues/7726
          (utils/orientation-change props state animations))
        (utils/effect props animations index)
-        [:f> lightbox-content
-         {:props                 props
-          :state                 state
-          :animations            animations
-          :derived               derived
-          :images                images
-          :index                 index
-          :handle-items-changed  handle-items-changed
-          :bottom-text-component bottom-text-component}]))))
+        [:f> lightbox-content props state animations derived messages index handle-items-changed]))))

 (defn lightbox
  []
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.constants)
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.constants)

 (def ^:const min-scale 1)

@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.style
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.style
  (:require
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]))
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.utils
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.utils
  (:require
    [clojure.string :as string]
    [react-native.core :as rn]
@@ -6,8 +6,8 @@
    [react-native.orientation :as orientation]
    [react-native.platform :as platform]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.zoomable-image.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as constants]
    [utils.re-frame :as rf]))

 ;;; Helpers
@@ -97,7 +97,7 @@
        (rescale constants/min-scale true)
        (js/setTimeout #(rf/dispatch [:navigate-back]) 70))
      (rf/dispatch [:navigate-back]))
-    (js/setTimeout #(rf/dispatch [:lightbox/exit-lightbox-signal nil]) 500)))
+    (js/setTimeout #(rf/dispatch [:chat.ui/exit-lightbox-signal nil]) 500)))

 (defn handle-zoom-out-signal
  "Zooms out when pressing on another photo from the small bottom list"
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.view
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.view
  (:require
    [oops.core :refer [oget]]
    [react-native.core :as rn]
@@ -7,10 +7,10 @@
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
    [reagent.core :as r]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.zoomable-image.constants :as c]
-    [status-im.common.lightbox.zoomable-image.style :as style]
-    [status-im.common.lightbox.zoomable-image.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.utils :as utils]
    [utils.re-frame :as rf]
    [utils.url :as url]))

@@ -206,7 +206,7 @@
             (anim/animate-decay pan-y-start velocity [lower-bound upper-bound]))))))))

 (defn- f-zoomable-image
-  [dimensions animations state rescale curr-orientation image focused? index render-data
+  [dimensions animations state rescale curr-orientation content focused? index render-data
   image-dimensions-nil?]
  (let [{:keys [transparent? set-full-height?]} render-data
        portrait? (= curr-orientation orientation/portrait)
@@ -229,7 +229,7 @@
                               (= curr-orientation orientation/portrait))}
      [reanimated/fast-image
       (merge
-        {:source    {:uri (url/replace-port image (rf/sub [:mediaserver/port]))}
+        {:source    {:uri (url/replace-port (:image content) (rf/sub [:mediaserver/port]))}
         :native-ID (when focused? :shared-element)
         :style     (style/image dimensions animations render-data index)}
        (when image-dimensions-nil?
@@ -238,12 +238,12 @@
 (defn zoomable-image
  []
  (let [state (utils/init-state)]
-    (fn [{:keys [image-width image-height image id]} index render-data]
-      (let [animation-shared-element-id                 (rf/sub [:animation-shared-element-id])
+    (fn [{:keys [image-width image-height content message-id]} index render-data]
+      (let [shared-element-id                           (rf/sub [:shared-element-id])
            exit-lightbox-signal                        (rf/sub [:lightbox/exit-signal])
            zoom-out-signal                             (rf/sub [:lightbox/zoom-out-signal])
            {:keys [set-full-height? curr-orientation]} render-data
-            focused?                                    (= animation-shared-element-id id)
+            focused?                                    (= shared-element-id message-id)
            ;; TODO - remove `image-dimensions` check, once
            ;; https://github.com/status-im/status-desktop/issues/10944 is fixed
            image-dimensions-nil?                       (not (and image-width image-height))
@@ -269,5 +269,5 @@
                                             rescale
                                             set-full-height?))
        (utils/handle-zoom-out-signal zoom-out-signal index (anim/get-val (:scale animations)) rescale)
-        [:f> f-zoomable-image dimensions animations state rescale curr-orientation image focused?
+        [:f> f-zoomable-image dimensions animations state rescale curr-orientation content focused?
         index render-data image-dimensions-nil?]))))
@@ -7,8 +7,6 @@
    [status-im.constants :as constants]
    [status-im.contexts.chat.messenger.messages.content.album.style :as style]
    [status-im.contexts.chat.messenger.messages.content.image.view :as image]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.utils :as lightbox-utils]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.view :as lightbox]
    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -23,19 +21,17 @@

 (defn album-message
  [{:keys [albumize?] :as message} context on-long-press message-container-data]
-  (let [animation-shared-element-id (rf/sub [:animation-shared-element-id])
-        media-server-port           (rf/sub [:mediaserver/port])
-        album-messages              (:album message)
-        first-image                 (first album-messages)
-        album-style                 (if (> (:image-width first-image) (:image-height first-image))
-                                      :landscape
-                                      :portrait)
-        images-count                (count album-messages)
+  (let [shared-element-id (rf/sub [:shared-element-id])
+        media-server-port (rf/sub [:mediaserver/port])
+        first-image       (first (:album message))
+        album-style       (if (> (:image-width first-image) (:image-height first-image))
+                            :landscape
+                            :portrait)
+        images-count      (count (:album message))
        ;; album images are always square, except when we have 3 images, then they must be
        ;; rectangular
        ;; (portrait or landscape)
-        portrait?                   (and (= images-count rectangular-style-count)
-                                         (= album-style :portrait))]
+        portrait?         (and (= images-count rectangular-style-count) (= album-style :portrait))]
    (if (and albumize? (> images-count 1))
      [:<>
       [rn/view {:style {:margin-bottom 4}} [text/text-content first-image]]
@@ -56,21 +52,14 @@
              {:key            (:message-id item)
               :active-opacity 1
               :on-long-press  #(on-long-press message context)
-               :on-press       #(rf/dispatch
-                                 [:lightbox/navigate-to-lightbox
-                                  (:message-id item)
-                                  {:index index
-                                   :images (into []
-                                                 (map
-                                                  lightbox-utils/convert-message-to-lightbox-image
-                                                  album-messages))
-                                   :bottom-text-component
-                                   [lightbox/bottom-text-for-lightbox
-                                    first-image]}])}
+               :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
+                                              (:message-id item)
+                                              {:messages (:album message)
+                                               :index    index}])}
              [fast-image/fast-image
               {:style     (style/image dimensions index portrait? images-count)
                :source    {:uri (url/replace-port (:image (:content item)) media-server-port)}
-                :native-ID (when (and (= animation-shared-element-id (:message-id item))
+                :native-ID (when (and (= shared-element-id (:message-id item))
                                      (< index constants/max-album-photos))
                             :shared-element)}]
              (when (and (> images-count constants/max-album-photos)
@@ -82,11 +71,11 @@
                   :size   :heading-2
                   :style  {:color colors/white}}
                  (str "+" (- images-count (dec constants/max-album-photos)))]])]))
-         album-messages)]]
+         (:album message))]]
      [:<>
       (map-indexed
        (fn [index item]
          [:<> {:key (:message-id item)}
           [image/image-message index item {:on-long-press #(on-long-press message context)}
            message-container-data]])
-        album-messages)])))
+        (:album message))])))
@@ -4,8 +4,6 @@
    [react-native.fast-image :as fast-image]
    [react-native.safe-area :as safe-area]
    [status-im.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.utils :as lightbox-utils]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.view :as lightbox]
    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -41,7 +39,7 @@
                                                            image-height
                                                            max-container-width
                                                            max-container-height)
-        animation-shared-element-id   (rf/sub [:animation-shared-element-id])
+        shared-element-id             (rf/sub [:shared-element-id])
        image-local-url               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
    [:<>
     (when (= index 0)
@@ -50,16 +48,13 @@
      {:active-opacity 1
       :style          {:margin-top 4}
       :on-long-press  on-long-press
-       :on-press       #(rf/dispatch [:lightbox/navigate-to-lightbox
+       :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
                                      message-id
-                                      {:images [(lightbox-utils/convert-message-to-lightbox-image
-                                                 message)]
-                                       :index 0
-                                       :insets insets
-                                       :bottom-text-component
-                                       [lightbox/bottom-text-for-lightbox message]}])}
+                                      {:messages [message]
+                                       :index    0
+                                       :insets   insets}])}
      [fast-image/fast-image
       {:source              {:uri image-local-url}
        :style               (merge dimensions {:border-radius 12})
-        :native-ID           (when (= animation-shared-element-id message-id) :shared-element)
+        :native-ID           (when (= shared-element-id message-id) :shared-element)
        :accessibility-label :image-message}]]]))
@@ -1,10 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn bottom-text
-  [expandable-text?]
-  {:color             colors/white
-   :margin-horizontal 20
-   :align-items       (when-not expandable-text? :center)
-   :flex-grow         1})
@@ -1,14 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.utils
-  (:require
-    [utils.datetime :as datetime]
-    [utils.re-frame :as rf]))
-
-(defn convert-message-to-lightbox-image
-  [{:keys [timestamp image-width image-height message-id from content]}]
-  (let [[primary-name _] (rf/sub [:contacts/contact-two-names-by-identity from])]
-    {:image        (:image content)
-     :image-width  image-width
-     :image-height image-height
-     :id           message-id
-     :header       primary-name
-     :description  (when timestamp (datetime/to-short-str timestamp))}))
@@ -1,18 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.view
-  (:require
-    [oops.core :as oops]
-    [reagent.core :as reagent]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.style :as style]
-    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))
-
-(defn bottom-text-for-lightbox
-  [_]
-  (let [text-height (reagent/atom 0)]
-    (fn [{:keys [content chat-id] :as _message}]
-      (let [expandable-text? (> @text-height (* constants/line-height 2))]
-        [message-view/render-parsed-text
-         {:content        content
-          :chat-id        chat-id
-          :style-override (style/bottom-text expandable-text?)
-          :on-layout      #(reset! text-height (oops/oget % "nativeEvent.layout.height"))}]))))
@@ -6,7 +6,6 @@
    [legacy.status-im.chat.models.message :as models.message]
    [legacy.status-im.data-store.activities :as data-store.activities]
    [legacy.status-im.data-store.chats :as data-store.chats]
-    [legacy.status-im.data-store.communities :as data-store.communities]
    [legacy.status-im.data-store.invitations :as data-store.invitations]
    [legacy.status-im.group-chats.core :as models.group]
    [legacy.status-im.multiaccounts.update.core :as update.core]
@@ -128,7 +127,7 @@
      (seq requests-to-join-community)
      (let [requests (->> requests-to-join-community
                          types/js->clj
-                          (map data-store.communities/<-request-to-join-community-rpc))]
+                          (map communities/<-request-to-join-community-rpc))]
        (js-delete response-js "requestsToJoinCommunity")
        (rf/merge cofx
                  (process-next response-js sync-handler)
@@ -6,28 +6,25 @@
    [status-im.common.password-authentication.view :as password-authentication]
    [status-im.contexts.communities.actions.accounts-selection.style :as style]
    [status-im.contexts.communities.actions.community-rules.view :as community-rules]
-    [status-im.contexts.communities.utils :as communities.utils]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

 (defn- join-community-and-navigate-back
  [id]
-  (rf/dispatch [:password-authentication/show {:content (fn [] [password-authentication/view])}
+  (rf/dispatch [:password-authentication/show
+                {:content (fn [] [password-authentication/view])}
                {:label    (i18n/label :t/join-open-community)
                 :on-press #(rf/dispatch [:communities/request-to-join-with-addresses
-                                          {:community-id id :password %}])}])
+                                          {:community-id id
+                                           :password     %}])}])
  (rf/dispatch [:navigate-back]))

 (defn f-view-internal
  []
-  (let [{id :community-id}                (rf/sub [:get-screen-params])
-        {:keys [name color images]}       (rf/sub [:communities/community id])
-        airdrop-account                   (rf/sub [:communities/airdrop-account id])
-        selected-accounts                 (rf/sub [:communities/selected-permission-accounts id])
-        {:keys [highest-permission-role]} (rf/sub [:community/token-gated-overview id])
-        highest-role-text                 (i18n/label (communities.utils/role->translation-key
-                                                       highest-permission-role
-                                                       :t/member))]
+  (let [{id :community-id}          (rf/sub [:get-screen-params])
+        {:keys [name color images]} (rf/sub [:communities/community id])
+        airdrop-account             (rf/sub [:communities/airdrop-account id])
+        selected-accounts           (rf/sub [:communities/selected-permission-accounts id])]
    [rn/view {:style style/container}
     [quo/page-nav
      {:text-align          :left
@@ -51,7 +48,7 @@
        (i18n/label :t/address-to-share)]
       [quo/category
        {:list-type :settings
-         :data      [{:title             (i18n/label :t/join-as-a {:role highest-role-text})
+         :data      [{:title             (i18n/label :t/join-as-a-member)
                      :on-press          #(rf/dispatch [:open-modal :addresses-for-permissions
                                                        {:community-id id}])
                      :description       :text
@@ -13,10 +13,3 @@
   :gap             4
   :justify-content :center
   :margin-bottom   8})
-
-(def highest-role
-  {:flex-direction  :row
-   :gap             4
-   :justify-content :center
-   :align-items     :center
-   :margin-bottom   8})
@@ -4,7 +4,6 @@
            [react-native.core :as rn]
            [status-im.common.not-implemented :as not-implemented]
            [status-im.contexts.communities.actions.addresses-for-permissions.style :as style]
-            [status-im.contexts.communities.utils :as communities.utils]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

@@ -23,14 +22,10 @@

 (defn view
  []
-  (let [{id :community-id} (rf/sub [:get-screen-params])
+  (let [{id :community-id}          (rf/sub [:get-screen-params])
        {:keys [name color images]} (rf/sub [:communities/community id])
-        {:keys [highest-permission-role]} (rf/sub [:community/token-gated-overview id])
-        accounts (rf/sub [:wallet/accounts-with-customization-color])
-        selected-addresses (rf/sub [:communities/selected-permission-addresses id])
-        highest-role-text
-        (i18n/label
-         (communities.utils/role->translation-key highest-permission-role))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])
+        selected-addresses          (rf/sub [:communities/selected-permission-addresses id])]
    [rn/safe-area-view {:style style/container}
     [quo/drawer-top
      {:type                :context-tag
@@ -48,19 +43,6 @@
       :key-fn                  :address
       :data                    accounts}]

-     (when (and highest-permission-role (seq selected-addresses))
-       [rn/view
-        {:style style/highest-role}
-        [quo/text
-         {:size  :paragraph-2
-          :style {:color colors/neutral-50}}
-         (i18n/label :t/eligible-to-join-as {:role ""})]
-        [quo/context-tag
-         {:type    :icon
-          :icon    :i/members
-          :size    24
-          :context highest-role-text}]])
-
     (when (empty? selected-addresses)
       [rn/view
        {:style style/error-message}
@@ -1,16 +1,13 @@
 (ns status-im.contexts.communities.discover.style
  (:require
+    [react-native.platform :as platform]
    [status-im.contexts.shell.jump-to.constants :as jump-to.constants]))

-(def header-height 56)
-
-(defn screen-title-container
-  [safe-area-top]
-  {:height            header-height
+(def screen-title-container
+  {:height            56
   :padding-vertical  12
   :justify-content   :center
-   :margin-horizontal 20
-   :margin-top        (+ header-height safe-area-top)})
+   :margin-horizontal 20})

 (def featured-communities-header
  {:flex-direction  :row
@@ -43,7 +40,7 @@
  [fixed?]
  (merge
   {:padding-vertical 12
-    :height           header-height
+    :height           56
    :background-color :transparent}
   (when-not fixed?
     {:margin-top        12
@@ -63,12 +60,15 @@
  {:align-items     :center
   :justify-content :center})

+(def render-communities-container
+  {:margin-top (if platform/ios? 57 104)})
+
 (defn blur-tabs-header
-  [safe-area-top]
+  []
  {:padding-horizontal 20
   :position           :absolute
-   :top                (+ header-height safe-area-top)
-   :height             header-height
+   :top                (if platform/ios? 100 104)
+   :height             56
   :right              0
   :left               0
   :justify-content    :center
@@ -5,7 +5,6 @@
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
    [status-im.common.scroll-page.view :as scroll-page]
    [status-im.contexts.communities.actions.community-options.view :as options]
@@ -34,7 +33,7 @@
 (defn screen-title
  []
  [rn/view
-   {:style (style/screen-title-container (safe-area/get-top))}
+   {:style style/screen-title-container}
   [quo/text
    {:accessibility-label :communities-screen-title
     :weight              :semi-bold
@@ -184,6 +183,7 @@
   view-type]
  (fn []
    [rn/view
+     {:style style/render-communities-container}
     [discover-communities-header
      {:selected-tab               selected-tab
       :view-type                  view-type
@@ -196,7 +196,7 @@
  (fn []
    (when (> @scroll-height 360)
      [rn/view
-       {:style (style/blur-tabs-header (safe-area/get-top))}
+       {:style (style/blur-tabs-header)}
       [discover-communities-segments selected-tab true]])))

 (defn discover-screen-content
@@ -209,7 +209,6 @@
      [scroll-page/scroll-page
       {:theme            theme
        :on-scroll        #(reset! scroll-height %)
-        :page-nav-props   {:background :blur}
        :navigate-back?   :true
        :height           (if (> @scroll-height 360)
                            208
@@ -1,56 +1,96 @@
 (ns status-im.contexts.communities.events
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.data-store.chats :as data-store.chats]
-    [legacy.status-im.data-store.communities :as data-store.communities]
-    [legacy.status-im.mailserver.core :as mailserver]
-    [react-native.platform :as platform]
-    [react-native.share :as share]
-    [schema.core :as schema]
-    [status-im.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview.events]
-    status-im.contexts.communities.actions.community-options.events
-    status-im.contexts.communities.actions.leave.events
-    [status-im.navigation.events :as navigation]
-    [taoensso.timbre :as log]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+  (:require [clojure.set :as set]
+            [clojure.string :as string]
+            [clojure.walk :as walk]
+            [legacy.status-im.data-store.chats :as data-store.chats]
+            [legacy.status-im.mailserver.core :as mailserver]
+            [react-native.platform :as platform]
+            [react-native.share :as share]
+            [schema.core :as schema]
+            [status-im.constants :as constants]
+            [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview.events]
+            status-im.contexts.communities.actions.community-options.events
+            status-im.contexts.communities.actions.leave.events
+            [status-im.navigation.events :as navigation]
+            [taoensso.timbre :as log]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))

-(defn handle-community
-  [{:keys [db]} [community-js]]
-  (when community-js
-    (let [{:keys [token-permissions
-                  token-permissions-check joined id]
-           :as   community} (data-store.communities/<-rpc community-js)
-          has-channel-perm? (fn [id-perm-tuple]
-                              (let [{:keys [type]} (second id-perm-tuple)]
-                                (or (= type constants/community-token-permission-can-view-channel)
-                                    (=
-                                     type
-                                     constants/community-token-permission-can-view-and-post-channel))))]
-      {:db (assoc-in db [:communities id] community)
-       :fx [[:dispatch [:communities/initialize-permission-addresses id]]
-            (when (not joined)
-              [:dispatch [:chat.ui/spectate-community id]])
-            (when (nil? token-permissions-check)
-              [:dispatch [:communities/check-permissions-to-join-community id]])
-            (when (some has-channel-perm? token-permissions)
-              [:dispatch [:communities/check-all-community-channels-permissions id]])
-            (when joined
-              [:dispatch [:communities/get-revealed-accounts id]])]})))
+(defn <-request-to-join-community-rpc
+  [r]
+  (set/rename-keys r
+                   {:communityId :community-id
+                    :publicKey   :public-key
+                    :chatId      :chat-id}))

-(rf/reg-event-fx :communities/handle-community handle-community)
+(defn <-requests-to-join-community-rpc
+  [requests key-fn]
+  (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))

-(schema/=> handle-community
-  [:=>
-   [:catn
-    [:cofx :schema.re-frame/cofx]
-    [:args
-     [:schema [:catn [:community-js map?]]]]]
-   [:maybe
-    [:map
-     [:db [:map [:communities map?]]]
-     [:fx vector?]]]])
+(defn <-chats-rpc
+  [chats]
+  (reduce-kv (fn [acc k v]
+               (assoc acc
+                      (name k)
+                      (-> v
+                          (assoc :can-post? (:canPost v))
+                          (dissoc :canPost)
+                          (update :members walk/stringify-keys))))
+             {}
+             chats))
+
+(defn <-categories-rpc
+  [categ]
+  (reduce-kv #(assoc %1 (name %2) %3) {} categ))
+
+(defn <-rpc
+  [c]
+  (-> c
+      (set/rename-keys {:canRequestAccess            :can-request-access?
+                        :canManageUsers              :can-manage-users?
+                        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
+                        :canJoin                     :can-join?
+                        :requestedToJoinAt           :requested-to-join-at
+                        :isMember                    :is-member?
+                        :adminSettings               :admin-settings
+                        :tokenPermissions            :token-permissions
+                        :communityTokensMetadata     :tokens-metadata
+                        :introMessage                :intro-message
+                        :muteTill                    :muted-till})
+      (update :admin-settings
+              set/rename-keys
+              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
+      (update :members walk/stringify-keys)
+      (update :chats <-chats-rpc)
+      (update :token-permissions seq)
+      (update :categories <-categories-rpc)
+      (assoc :token-images
+             (reduce (fn [acc {sym :symbol image :image}]
+                       (assoc acc sym image))
+                     {}
+                     (:communityTokensMetadata c)))))
+
+(rf/reg-event-fx :communities/handle-community
+ (fn [{:keys [db]}
+      [community-js]]
+   (when community-js
+     (let [{:keys [token-permissions
+                   token-permissions-check joined id]
+            :as   community} (<-rpc community-js)
+           has-channel-perm? (fn [id-perm-tuple]
+                               (let [{:keys [type]} (second id-perm-tuple)]
+                                 (or (= type constants/community-token-permission-can-view-channel)
+                                     (=
+                                      type
+                                      constants/community-token-permission-can-view-and-post-channel))))]
+       {:db (assoc-in db [:communities id] community)
+        :fx [[:dispatch [:communities/initialize-permission-addresses id]]
+             (when (not joined)
+               [:dispatch [:chat.ui/spectate-community id]])
+             (when (nil? token-permissions-check)
+               [:dispatch [:communities/check-permissions-to-join-community id]])
+             (when (some has-channel-perm? token-permissions)
+               [:dispatch [:communities/check-all-community-channels-permissions id]])]}))))

 (rf/defn handle-removed-chats
  [{:keys [db]} chat-ids]
@@ -124,7 +164,7 @@
 (fn [{:keys [db]} [requests]]
   {:db (assoc db
               :communities/my-pending-requests-to-join
-               (data-store.communities/<-requests-to-join-community-rpc requests :communityId))}))
+               (<-requests-to-join-community-rpc requests :communityId))}))

 (rf/reg-event-fx :communities/get-user-requests-to-join
 (fn [_]
@@ -200,19 +240,12 @@

 (defn toggle-selected-permission-address
  [{:keys [db]} [address community-id]]
-  (let [selected-permission-addresses
-        (get-in db [:communities community-id :selected-permission-addresses])
-        updated-selected-permission-addresses
-        (if (contains? selected-permission-addresses address)
-          (disj selected-permission-addresses address)
-          (conj selected-permission-addresses address))]
-    {:db (assoc-in db
-          [:communities community-id :selected-permission-addresses]
-          updated-selected-permission-addresses)
-     :fx [(when community-id
-            [:dispatch
-             [:communities/check-permissions-to-join-community community-id
-              updated-selected-permission-addresses :based-on-client-selection]])]}))
+  {:db (update-in db
+                  [:communities community-id :selected-permission-addresses]
+                  (fn [selected-addresses]
+                    (if (contains? selected-addresses address)
+                      (disj selected-addresses address)
+                      (conj selected-addresses address))))})

 (rf/reg-event-fx :communities/toggle-selected-permission-address
 toggle-selected-permission-address)
@@ -222,8 +255,7 @@
   (when community-id
     {:db (assoc-in db
           [:communities community-id :selected-permission-addresses]
-           (get-in db [:communities community-id :previous-permission-addresses]))
-      :fx [[:dispatch [:communities/check-permissions-to-join-community community-id]]]})))
+           (get-in db [:communities community-id :previous-permission-addresses]))})))

 (rf/reg-event-fx :communities/share-community-channel-url-with-data
 (fn [_ [chat-id]]
@@ -362,80 +394,14 @@
     (rf/merge
      cofx
      {:fx [[:dispatch [:communities/fetch-community deserialized-key]]
-            [:dispatch [:navigate-to :community-overview deserialized-key]]
-            [:dispatch [:communities/update-last-opened-at deserialized-key]]]}
+            [:dispatch [:navigate-to :community-overview deserialized-key]]]}
      (navigation/pop-to-root :shell-stack)))))

 (rf/reg-event-fx :communities/navigate-to-community-chat
 (fn [{:keys [db]} [chat-id pop-to-root?]]
   (let [{:keys [community-id]} (get-in db [:chats chat-id])]
     {:fx [(when community-id
-             [:dispatch [:communities/fetch-community community-id]]
-             [:dispatch [:communities/update-last-opened-at community-id]])
+             [:dispatch [:communities/fetch-community community-id]])
           (if pop-to-root?
             [:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]]
             [:dispatch [:chat/navigate-to-chat chat-id]])]})))
-
-(defn get-revealed-accounts
-  [{:keys [db]} [community-id]]
-  (let [{:keys [joined fetching-revealed-accounts]
-         :as   community} (get-in db [:communities community-id])]
-    (when (and community joined (not fetching-revealed-accounts))
-      {:db (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
-       :json-rpc/call
-       [{:method      "wakuext_getRevealedAccounts"
-         :params      [community-id (get-in db [:profile/profile :public-key])]
-         :js-response true
-         :on-success  [:communities/get-revealed-accounts-success community-id]
-         :on-error    (fn [err]
-                        (log/error {:message      "failed to fetch revealed accounts"
-                                    :community-id community-id
-                                    :err          err})
-                        (rf/dispatch [:communities/get-revealed-accounts-failed community-id]))}]})))
-
-(rf/reg-event-fx :communities/get-revealed-accounts get-revealed-accounts)
-
-(schema/=> get-revealed-accounts
-  [:=>
-   [:catn
-    [:cofx :schema.re-frame/cofx]
-    [:args
-     [:schema [:catn [:community-id [:? :string]]]]]]
-   [:maybe
-    [:map
-     [:db map?]
-     [:json-rpc/call :schema.common/rpc-call]]]])
-
-(rf/reg-event-fx :communities/get-revealed-accounts-success
- (fn [{:keys [db]} [community-id revealed-accounts-js]]
-   (when-let [community (get-in db [:communities community-id])]
-     (let [revealed-accounts
-           (reduce
-            (fn [acc {:keys [address] :as revealed-account}]
-              (assoc acc address (dissoc revealed-account :address)))
-            {}
-            (data-store.communities/<-revealed-accounts-rpc revealed-accounts-js))
-
-           community-with-revealed-accounts
-           (-> community
-               (assoc :revealed-accounts revealed-accounts)
-               (dissoc :fetching-revealed-accounts))]
-       {:db (assoc-in db [:communities community-id] community-with-revealed-accounts)}))))
-
-(rf/reg-event-fx :communities/get-revealed-accounts-failed
- (fn [{:keys [db]} [community-id]]
-   (when (get-in db [:communities community-id])
-     {:db (update-in db [:communities community-id] dissoc :fetching-revealed-accounts)})))
-
-(rf/reg-event-fx :communities/update-last-opened-at
- (fn [_ [community-id]]
-   {:json-rpc/call [{:method     "wakuext_communityUpdateLastOpenedAt"
-                     :params     [community-id]
-                     :on-success #(rf/dispatch [:communities/update-last-opened-at-success community-id
-                                                %])
-                     :on-error   #(log/error (str "failed to update last opened at for community "
-                                                  %))}]}))
-
-(rf/reg-event-fx :communities/update-last-opened-at-success
- (fn [{:keys [db]} [community-id last-opened-at]]
-   {:db (assoc-in db [:communities community-id :last-opened-at] last-opened-at)}))
@@ -2,7 +2,6 @@
  (:require [cljs.test :refer [deftest is testing]]
            [legacy.status-im.mailserver.core :as mailserver]
            matcher-combinators.test
-            [status-im.constants :as constants]
            [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview.events]
            [status-im.contexts.communities.events :as events]))

@@ -194,79 +193,3 @@
      (is (match?
           nil
           (events/spectate-community-success {} []))))))
-
-(deftest get-revealed-accounts
-  (let [community {:id community-id}]
-    (testing "given a unjoined community"
-      (is (match?
-           nil
-           (events/get-revealed-accounts {:db {:communities {community-id community}}} [community-id]))))
-    (testing "given a already :fetching-revealed-accounts community"
-      (is (match?
-           nil
-           (events/get-revealed-accounts
-            {:db {:communities {community-id (assoc community :fetching-revealed-accounts true)}}}
-            [community-id]))))
-    (testing "given joined community"
-      (let [community (assoc community :joined true)
-            db        {:communities     {community-id community}
-                       :profile/profile {:public-key "profile-public-key"}}
-            effects   (events/get-revealed-accounts {:db db} [community-id])]
-        (is (match? (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
-                    (:db effects)))
-        (is (match? {:method "wakuext_getRevealedAccounts"
-                     :params [community-id "profile-public-key"]}
-                    (-> effects :json-rpc/call first (select-keys [:method :params]))))))))
-
-(deftest handle-community
-  (let [community {:id community-id}]
-    (testing "given a unjoined community"
-      (let [effects (events/handle-community {} [community])]
-        (is (match? community-id
-                    (-> effects :db :communities (get community-id) :id)))
-        (is (match?
-             [[:dispatch [:communities/initialize-permission-addresses community-id]]
-              [:dispatch [:chat.ui/spectate-community community-id]]
-              [:dispatch [:communities/check-permissions-to-join-community community-id]]]
-             (filter some? (:fx effects))))))
-    (testing "given a joined community"
-      (let [community (assoc community :joined true)
-            effects   (events/handle-community {} [community])]
-        (is (match?
-             [[:dispatch [:communities/initialize-permission-addresses community-id]]
-              [:dispatch [:communities/check-permissions-to-join-community community-id]]
-              [:dispatch [:communities/get-revealed-accounts community-id]]]
-             (filter some? (:fx effects))))))
-    (testing "given a community with token-permissions-check"
-      (let [community (assoc community :token-permissions-check :fake-token-permissions-check)
-            effects   (events/handle-community {} [community])]
-        (is (match?
-             [[:dispatch [:communities/initialize-permission-addresses community-id]]
-              [:dispatch [:chat.ui/spectate-community community-id]]]
-             (filter some? (:fx effects))))))
-    (testing "given a community with view channel permission"
-      (let [community (assoc community
-                             :token-permissions
-                             [["perm-id" {:type constants/community-token-permission-can-view-channel}]])
-            effects   (events/handle-community {} [community])]
-        (is (match?
-             [[:dispatch [:communities/initialize-permission-addresses community-id]]
-              [:dispatch [:chat.ui/spectate-community community-id]]
-              [:dispatch [:communities/check-permissions-to-join-community community-id]]
-              [:dispatch
-               [:communities/check-all-community-channels-permissions community-id]]]
-             (filter some? (:fx effects))))))
-
-    (testing "given a community with post in channel permission"
-      (let [community (assoc community
-                             :token-permissions
-                             [["perm-id"
-                               {:type constants/community-token-permission-can-view-and-post-channel}]])
-            effects   (events/handle-community {} [community])]
-        (is (match?
-             [[:dispatch [:communities/initialize-permission-addresses community-id]]
-              [:dispatch [:chat.ui/spectate-community community-id]]
-              [:dispatch [:communities/check-permissions-to-join-community community-id]]
-              [:dispatch
-               [:communities/check-all-community-channels-permissions community-id]]]
-             (filter some? (:fx effects))))))))
@@ -34,31 +34,26 @@
                                        :communities/check-all-community-channels-permissions}))}]]]})))

 (rf/reg-event-fx :communities/check-permissions-to-join-community-success
- (fn [{:keys [db]} [community-id based-on-client-selection? result]]
-   (let [token-permissions-check (cond-> result
-                                   based-on-client-selection? (assoc :based-on-client-selection? true))]
-     {:db (-> db
-              (assoc-in [:communities community-id :checking-permissions?] false)
-              (assoc-in [:communities community-id :token-permissions-check]
-                        token-permissions-check))})))
+ (fn [{:keys [db]} [community-id result]]
+   {:db (-> db
+            (assoc-in [:communities community-id :checking-permissions?] false)
+            (assoc-in [:communities community-id :token-permissions-check] result))}))

 (rf/reg-event-fx :communities/check-permissions-to-join-community-failed
 (fn [{:keys [db]} [community-id]]
   {:db (assoc-in db [:communities community-id :checking-permissions?] false)}))

 (rf/reg-event-fx :communities/check-permissions-to-join-community
- (fn [{:keys [db]} [community-id addresses based-on-client-selection?]]
+ (fn [{:keys [db]} [community-id]]
   (when-let [community (get-in db [:communities community-id])]
     (when-not (:checking-permissions? community)
       {:db            (-> db
                           (assoc-in [:communities community-id :checking-permissions?] true)
                           (assoc-in [:communities community-id :can-request-access?] false))
        :json-rpc/call [{:method     "wakuext_checkPermissionsToJoinCommunity"
-                         :params     [(cond-> {:communityId community-id}
-                                        addresses
-                                        (assoc :addresses addresses))]
+                         :params     [{:communityId community-id}]
                         :on-success [:communities/check-permissions-to-join-community-success
-                                      community-id based-on-client-selection?]
+                                      community-id]
                         :on-error   (fn [err]
                                       (rf/dispatch
                                        [:communities/check-permissions-to-join-community-failed
@@ -16,7 +16,6 @@
    [status-im.contexts.communities.actions.community-options.view :as options]
    [status-im.contexts.communities.overview.style :as style]
    [status-im.contexts.communities.overview.utils :as utils]
-    [status-im.contexts.communities.utils :as communities.utils]
    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -141,11 +140,7 @@
  []
  (fn [{:keys [id color]}]
    (let [{:keys [can-request-access?
-                  number-of-hold-tokens tokens
-                  highest-permission-role]} (rf/sub [:community/token-gated-overview id])
-          highest-role-text
-          (i18n/label
-           (communities.utils/role->translation-key highest-permission-role :t/member))]
+                  number-of-hold-tokens tokens]} (rf/sub [:community/token-gated-overview id])]
      [rn/view {:style (style/token-gated-container)}
       [rn/view
        {:style {:padding-horizontal 12
@@ -155,7 +150,7 @@
                 :flex               1}}
        [quo/text {:weight :medium}
         (if can-request-access?
-           (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
+           (i18n/label :t/you-eligible-to-join)
           (i18n/label :t/you-not-eligible-to-join))]
        [info-button]]
       (when (pos? number-of-hold-tokens)
@@ -168,26 +163,23 @@
        {:tokens   tokens
         :padding? true}]
       [quo/button
-        {:on-press
-         (if config/community-accounts-selection-enabled?
-           #(rf/dispatch [:open-modal :community-account-selection {:community-id id}])
-           #(join-gated-community id))
+        {:on-press            #(join-gated-community id)
         :accessibility-label :join-community-button
         :customization-color color
-         :container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
-         :disabled? (not can-request-access?)
-         :icon-left (if can-request-access? :i/unlocked :i/locked)}
+         :container-style     {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
+         :disabled?           (not can-request-access?)
+         :icon-left           (if can-request-access? :i/unlocked :i/locked)}
        (i18n/label :t/join-open-community)]])))

 (defn join-community
-  [{:keys [joined color permissions token-permissions membership-permissions? id] :as community}
+  [{:keys [joined color permissions token-permissions id] :as community}
   pending?]
  (let [access-type     (get-access-type (:access permissions))
        unknown-access? (= access-type :unknown-access)
        invite-only?    (= access-type :invite-only)]
    [:<>
     (when-not (or joined pending? invite-only? unknown-access?)
-       (if membership-permissions?
+       (if (seq token-permissions)
         [token-gates community]
         [quo/button
          {:on-press
@@ -198,7 +190,7 @@
           :accessibility-label :show-request-to-join-screen-button
           :customization-color color
           :icon-left :i/communities}
-          (i18n/label :t/request-to-join)]))
+          (i18n/label :t/request-to-join-community)]))

     (when (not (or joined pending? token-permissions))
       [quo/text
@@ -1,13 +0,0 @@
-(ns status-im.contexts.communities.utils
-  (:require
-    [status-im.constants :as constants]))
-
-(defn role->translation-key
-  ([role] (role->translation-key role nil))
-  ([role fallback-to]
-   (condp = role
-     constants/community-token-permission-become-token-owner  :t/token-owner
-     constants/community-token-permission-become-token-master :t/token-master
-     constants/community-token-permission-become-admin        :t/admin
-     constants/community-token-permission-become-member       :t/member
-     fallback-to)))
@@ -16,6 +16,7 @@
    [status-im.common.log :as logging]
    [status-im.common.universal-links :as universal-links]
    [status-im.config :as config]
+    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts]
    [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview]
    [status-im.contexts.profile.config :as profile.config]
@@ -177,11 +178,11 @@
 (rf/defn login-with-biometric-if-available
  {:events [:profile.login/login-with-biometric-if-available]}
  [_ key-uid]
-  {:biometric/check-if-available [key-uid
-                                  #(rf/dispatch [:profile.login/check-biometric-success % key-uid])]})
+  {:keychain/get-auth-method [key-uid
+                              #(rf/dispatch [:profile.login/get-auth-method-success % key-uid])]})

-(rf/defn check-biometric-success
-  {:events [:profile.login/check-biometric-success]}
+(rf/defn get-auth-method-success
+  {:events [:profile.login/get-auth-method-success]}
  [{:keys [db]} auth-method key-uid]
  (merge {:db (assoc db :auth-method auth-method)}
         (when (= auth-method keychain/auth-method-biometric)
@@ -193,6 +194,7 @@
                                        :on-fail    #(rf/dispatch
                                                      [:profile.login/biometric-auth-fail %])}]))}})))

+;; result of :keychain/get-auth-method above
 (rf/defn get-user-password-success
  {:events [:profile.login/get-user-password-success]}
  [{:keys [db] :as cofx} password]
@@ -207,18 +209,22 @@
 :profile.login/biometric-success
 (fn [{:keys [db]}]
   (let [key-uid (get-in db [:profile/login :key-uid])]
-     {:keychain/get-user-password [key-uid
-                                   #(rf/dispatch [:profile.login/get-user-password-success %])]})))
+     {:db db
+      :fx [[:biometric/reset-not-enrolled-error key-uid]
+           [:keychain/get-user-password
+            [key-uid #(rf/dispatch [:profile.login/get-user-password-success %])]]]})))

 (rf/reg-event-fx
 :profile.login/biometric-auth-fail
- (fn [_ [error]]
-   (log/error (ex-message error)
-              (-> error
-                  ex-data
-                  (assoc :code  (ex-cause error)
-                         :event :profile.login/biometric-auth-fail)))
-   {:dispatch [:biometric/show-message error]}))
+ (fn [{:keys [db]} [code]]
+   (let [key-uid (get-in db [:profile/login :key-uid])]
+     {:db db
+      :fx [(if (= code constants/biometric-error-not-enrolled)
+             [:biometric/supress-not-enrolled-error
+              [key-uid
+               [:biometric/show-message code]]]
+             [:dispatch [:biometric/show-message code]])]})))
+

 (rf/defn verify-database-password
  {:events [:profile.login/verify-database-password]}
@@ -2,7 +2,6 @@
  (:require
    [quo.foundations.colors :as colors]
    [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]
    [status-im.contexts.shell.jump-to.utils :as utils]))

 (defn bottom-tabs-container
@@ -29,11 +28,10 @@

 (defn bottom-tabs-blur-overlay
  [height]
-  (reanimated/apply-animations-to-style
-   {:height height}
+  [{:height height}
   {:position         :absolute
    :left             0
    :right            0
    :bottom           0
    :height           (utils/bottom-tabs-container-height)
-    :background-color colors/neutral-100-opa-70-blur}))
+    :background-color colors/neutral-100-opa-70-blur}])
@@ -15,12 +15,12 @@
 (defn profile-tab
  []
  (let [{:keys [emoji-hash
+                customization-color
                universal-profile-url]
-         :as   profile}     (rf/sub [:profile/profile-with-image])
-        customization-color (rf/sub [:profile/customization-color])
-        abbreviated-url     (address/get-abbreviated-profile-url
-                             universal-profile-url)
-        emoji-hash-string   (string/join emoji-hash)]
+         :as   profile}   (rf/sub [:profile/profile])
+        abbreviated-url   (address/get-abbreviated-profile-url
+                           universal-profile-url)
+        emoji-hash-string (string/join emoji-hash)]
    [rn/scroll-view
     {:content-container-style {:padding-bottom 16}}
     [rn/view {:style style/qr-code-container}
@@ -1,18 +0,0 @@
-(ns status-im.contexts.shell.share.wallet.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn indicator-wrapper-style
-  [active?]
-  {:width            8
-   :height           8
-   :border-radius    4
-   :background-color colors/white
-   :opacity          (if active? 1.0 0.5)})
-
-(def indicator-list-style
-  {:display         :flex
-   :flex-direction  :row
-   :align-items     :center
-   :justify-content :center
-   :gap             8})
@@ -6,7 +6,6 @@
    [react-native.share :as share]
    [reagent.core :as reagent]
    [status-im.contexts.shell.share.style :as style]
-    [status-im.contexts.shell.share.wallet.style :as wallet-style]
    [status-im.contexts.wallet.common.sheets.network-preferences.view :as network-preferences]
    [status-im.contexts.wallet.common.utils :as utils]
    [utils.i18n :as i18n]
@@ -44,11 +43,10 @@
                                          (rf/dispatch [:hide-bottom-sheet])
                                          (reset! selected-networks (map #(get utils/id->network %)
                                                                         chain-ids)))}])}]))
-(defn- wallet-qr-code-item-internal
-  [props]
-  (let [{:keys [account width index]} props
-        selected-networks             (reagent/atom [:ethereum :optimism :arbitrum])
-        wallet-type                   (reagent/atom :wallet-legacy)]
+(defn wallet-qr-code-item
+  [account width index]
+  (let [selected-networks (reagent/atom [:ethereum :optimism :arbitrum])
+        wallet-type       (reagent/atom :wallet-legacy)]
    (fn []
      (let [share-title         (str (:name account) " " (i18n/label :t/address))
            qr-url              (utils/get-wallet-qr {:wallet-type       @wallet-type
@@ -59,7 +57,7 @@
                                  :port        (rf/sub [:mediaserver/port])
                                  :qr-size     qr-size
                                  :error-level :highest})]
-        [rn/view {:style {:height qr-size :width width :margin-left (if (zero? index) 0 -30)}}
+        [rn/view {:style {:width width :margin-left (if (zero? index) 0 -30)}}
         [rn/view {:style style/qr-code-container}
          [quo/share-qr-code
           {:type                @wallet-type
@@ -75,54 +73,18 @@
            :on-legacy-press     #(reset! wallet-type :wallet-legacy)
            :on-settings-press   #(open-preferences @selected-networks)}]]]))))

-(def wallet-qr-code-item (memoize wallet-qr-code-item-internal))
-
-(defn- indicator
-  [active?]
-  [rn/view
-   {:style (wallet-style/indicator-wrapper-style active?)}])
-
-(defn- indicator-list
-  [indicator-count current-index]
-  [rn/view
-   {:style wallet-style/indicator-list-style}
-   (for [i (range indicator-count)]
-     (let [current-index (cond (<= current-index 0)                     0
-                               (>= current-index (dec indicator-count)) (dec indicator-count)
-                               :else                                    current-index)]
-       ^{:key i} [indicator (= current-index i)]))])
-
-(defn render-item
-  [item]
-  (let [width (rf/sub [:dimensions/window-width])]
-    [wallet-qr-code-item
-     {:account item
-      :index   (:position item)
-      :width   width}]))
-
 (defn wallet-tab
  []
-  (let [accounts      (rf/sub [:wallet/accounts])
-        width         (rf/sub [:dimensions/window-width])
-        current-index (reagent/atom 0)]
-    (fn []
-      [rn/view
-       [rn/flat-list
-        {:horizontal                        true
-         :deceleration-rate                 0.9
-         :snap-to-alignment                 :start
-         :snap-to-interval                  (- width 30)
-         :disable-interval-momentum         true
-         :scroll-event-throttle             64
-         :data                              accounts
-         :directional-lock-enabled          true
-         :shows-horizontal-scroll-indicator false
-         :on-scroll                         (fn [e]
-                                              (reset! current-index (js/Math.ceil
-                                                                     (/ e.nativeEvent.contentOffset.x
-                                                                        width))))
-         :render-fn                         render-item}]
-       (when (> (count accounts) 1)
-         [rn/view
-          {:style {:margin-top 20}}
-          (indicator-list (count accounts) @current-index)])])))
+  (let [accounts (rf/sub [:wallet/accounts])
+        width    (rf/sub [:dimensions/window-width])]
+    [rn/flat-list
+     {:horizontal                true
+      :deceleration-rate         0.9
+      :snap-to-alignment         "start"
+      :snap-to-interval          (- width 30)
+      :disable-interval-momentum true
+      :scroll-event-throttle     64
+      :data                      accounts
+      :directional-lock-enabled  true
+      :render-fn                 (fn [account index]
+                                   (wallet-qr-code-item account width index))}]))
@@ -13,14 +13,6 @@
  [item]
  {:source (quo.resources/get-network (:network-name item))})

-(defn- bridge-token-component
-  []
-  (fn [token]
-    (let [on-press #(rf/dispatch [:wallet/select-bridge-to
-                                  {:token    token
-                                   :stack-id :wallet-bridge}])]
-      [quo/token-network (assoc token :on-press on-press)])))
-
 (defn view
  []
  (let [networks       (rf/sub [:wallet/network-details])
@@ -38,5 +30,5 @@
       :placeholder     (i18n/label :t/search-assets)}]
     [rn/flat-list
      {:data                    (temp/bridge-token-list networks-logos)
-       :render-fn               bridge-token-component
+       :render-fn               quo/token-network
       :content-container-style style/list-content-container}]]))
@@ -1,9 +0,0 @@
-(ns status-im.contexts.wallet.account.bridge-to.style)
-
-(def header-container
-  {:padding-horizontal 20
-   :padding-vertical   12})
-
-(def content-container
-  {:padding-horizontal 8})
-
@@ -1,64 +0,0 @@
-(ns status-im.contexts.wallet.account.bridge-to.view
-  (:require
-    [clojure.string :as string]
-    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [status-im.contexts.wallet.account.bridge-to.style :as style]
-    [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
-    [status-im.contexts.wallet.common.utils :as utils]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn- bridge-token-component
-  []
-  (fn [{:keys [chain-id network-name]} token]
-    (let [network           (rf/sub [:wallet/network-details-by-chain-id chain-id])
-          currency          (rf/sub [:profile/currency])
-          currency-symbol   (rf/sub [:profile/currency-symbol])
-          all-balances      (:balances-per-chain token)
-          balance-for-chain (utils/get-balance-for-chain all-balances chain-id)
-          crypto-formatted  (or (:balance balance-for-chain) "0.00")
-          fiat-value        (utils/token-fiat-value currency
-                                                    (or (:balance balance-for-chain) 0)
-                                                    token)
-          fiat-formatted    (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
-      [quo/network-list
-       {:label         (name network-name)
-        :network-image (quo.resources/get-network (:network-name network))
-        :token-value   (str crypto-formatted " " (:symbol token))
-        :fiat-value    fiat-formatted}])))
-
-(defn- view-internal
-  []
-  (let [send-bridge-data (rf/sub [:wallet/wallet-send])
-        network-details  (rf/sub [:wallet/network-details])
-        account          (rf/sub [:wallet/current-viewing-account])
-        token            (:token send-bridge-data)
-        token-symbol     (:symbol token)
-        tokens           (:tokens account)
-        mainnet          (first network-details)
-        layer-2-networks (rest network-details)
-        account-token    (some #(when (= token-symbol (:symbol %)) %) tokens)]
-
-
-    [rn/view
-     [account-switcher/view
-      {:on-press            #(rf/dispatch [:navigate-back-within-stack :wallet-bridge-to])
-       :icon-name           :i/arrow-left
-       :accessibility-label :top-bar}]
-     [quo/text-combinations
-      {:container-style style/header-container
-       :title           (i18n/label :t/bridge-to {:name (string/upper-case (str (:label token)))})}]
-     [rn/view style/content-container
-      [bridge-token-component (assoc mainnet :network-name :t/mainnet) account-token]]
-
-     [quo/divider-label (i18n/label :t/layer-2)]
-     [rn/flat-list
-      {:data                    layer-2-networks
-       :render-fn               (fn [network]
-                                  [bridge-token-component network account-token])
-       :content-container-style style/content-container}]]))
-
-(def view (quo.theme/with-theme view-internal))
@@ -3,7 +3,6 @@
    [quo.core :as quo]
    [react-native.core :as rn]
    [reagent.core :as reagent]
-    [status-im.config :as config]
    [status-im.contexts.wallet.account.style :as style]
    [status-im.contexts.wallet.account.tabs.view :as tabs]
    [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
@@ -53,9 +52,7 @@
             :receive-action #(rf/dispatch [:open-modal :wallet-share-address {:status :receive}])
             :buy-action     #(rf/dispatch [:show-bottom-sheet
                                            {:content buy-drawer}])
-             :bridge-action  (if (:bridge-token config/wallet-feature-flags)
-                               #(rf/dispatch [:open-modal :wallet-bridge])
-                               #(js/alert "feature disabled in config file"))}])
+             :bridge-action  #(rf/dispatch [:open-modal :wallet-bridge])}])
         [quo/tabs
          {:style            style/tabs
           :size             32
@@ -3,6 +3,7 @@
            [quo.theme]
            [react-native.core :as rn]
            [status-im.contexts.wallet.collectible.tabs.about.style :as style]
+            [status-im.contexts.wallet.temp :as temp]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

@@ -13,8 +14,7 @@
  (let [window-width               (rf/sub [:dimensions/window-width])
        item-width                 (- (/ window-width 2) link-card-space)
        {:keys [collectible-data]} (rf/sub [:wallet/last-collectible-details])
-        link-card-container-style  (style/link-card item-width)
-        collectible-about          {:cards []}]
+        link-card-container-style  (style/link-card item-width)]
    [:<>
     [rn/view {:style style/title}
      [quo/text
@@ -25,13 +25,12 @@
      [quo/text
       {:size :paragraph-2}
       (:description collectible-data)]]
-     (when (count collectible-about)
-       [quo/section-label
-        {:container-style style/section-label
-         :section         (i18n/label :t/on-the-web)}]
-       [rn/view {:style style/link-cards-container}
-        (for [item (:cards collectible-about)]
-          ^{:key (:title item)}
-          [quo/link-card (assoc item :container-style link-card-container-style)])])]))
+     [quo/section-label
+      {:container-style style/section-label
+       :section         (i18n/label :t/on-the-web)}]
+     [rn/view {:style style/link-cards-container}
+      (for [item (:cards temp/collectible-about)]
+        ^{:key (:title item)}
+        [quo/link-card (assoc item :container-style link-card-container-style)])]]))

 (def view (quo.theme/with-theme view-internal))
@@ -1,6 +1,7 @@
 (ns status-im.contexts.wallet.collectible.tabs.activity.view
  (:require [quo.core :as quo]
-            [react-native.core :as rn]))
+            [react-native.core :as rn]
+            [status-im.contexts.wallet.temp :as temp]))

 (defn activity-item
  [item]
@@ -11,6 +12,6 @@
 (defn view
  []
  [rn/flat-list
-   {:data      nil
+   {:data      temp/collectible-activities
    :style     {:flex 1}
    :render-fn activity-item}])
@@ -3,7 +3,6 @@
    [quo.core :as quo]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [react-native.svg :as svg]
    [reagent.core :as reagent]
    [status-im.common.scroll-page.view :as scroll-page]
    [status-im.contexts.wallet.collectible.style :as style]
@@ -76,18 +75,12 @@
  (let [selected-tab  (reagent/atom :overview)
        on-tab-change #(reset! selected-tab %)]
    (fn []
-      (let [collectible                 (rf/sub [:wallet/last-collectible-details])
-            animation-shared-element-id (rf/sub [:animation-shared-element-id])
-            {:keys [id
-                    preview-url
-                    collection-data
-                    collectible-data]}  collectible
-            {svg?        :svg?
-             preview-uri :uri}          preview-url
-            token-id                    (:token-id id)
+      (let [collectible               (rf/sub [:wallet/last-collectible-details])
+            {:keys [collectible-data preview-url
+                    collection-data]} collectible
            {collection-image :image-url
-             collection-name  :name}    collection-data
-            {collectible-name :name}    collectible-data]
+             collection-name  :name}  collection-data
+            {collectible-name :name}  collectible-data]
        [scroll-page/scroll-page
         {:navigate-back? true
          :height         148
@@ -99,38 +92,12 @@
                                                       [:show-bottom-sheet
                                                        {:content collectible-actions-sheet
                                                         :theme   theme}])}]
-                           :picture     preview-uri}}
+                           :picture     preview-url}}
         [rn/view {:style style/container}
          [rn/view {:style style/preview-container}
-           [rn/touchable-opacity
-            {:active-opacity 1
-             :on-press       (fn []
-                               (if svg?
-                                 (js/alert "Can't visualize SVG images in lightbox")
-                                 (rf/dispatch [:lightbox/navigate-to-lightbox
-                                               token-id
-                                               {:images [{:image        preview-uri
-                                                          :image-width  300 ; collectibles don't have
-                                                          ; width/height but we need
-                                                          ; to pass something
-                                                          :image-height 300 ; without it animation
-                                                          ; doesn't work smoothly and
-                                                          ; :border-radius not
-                                                          ; applied
-                                                          :id           token-id
-                                                          :header       collectible-name
-                                                          :description  collection-name}]
-                                                :index  0}])))}
-            (if svg?
-              [rn/view
-               {:style     (assoc style/preview :overflow :hidden)
-                :native-ID (when (= animation-shared-element-id token-id)
-                             :shared-element)}
-               [svg/svg-uri (assoc style/preview :uri preview-uri)]]
-              [rn/image
-               {:source    preview-uri
-                :style     style/preview
-                :native-ID (when (= animation-shared-element-id token-id) :shared-element)}])]]
+           [rn/image
+            {:source preview-url
+             :style  style/preview}]]
          [header collectible-name collection-name collection-image]
          [cta-buttons]
          [quo/tabs
@@ -52,7 +52,6 @@
    :fiat-value          "€0.00"
    :networks            networks-list
    :state               :default
-    :symbol              "STT"
    :customization-color :blue}
   {:token               :eth
    :label               "Ethereum"
@@ -60,7 +59,6 @@
    :fiat-value          "€0.00"
    :networks            networks-list
    :state               :default
-    :symbol              "ETH"
    :customization-color :blue}
   {:token               :dai
    :label               "Dai"
@@ -68,7 +66,6 @@
    :fiat-value          "€0.00"
    :networks            networks-list
    :state               :default
-    :symbol              "DAI"
    :customization-color :blue}])

 (def secret-phrase
@@ -41,12 +41,10 @@

 (defn view
  [item]
-  (let [{:keys [watch-only?]} (rf/sub [:wallet/current-viewing-account])]
-    [quo/token-value
-     (cond-> item
-       (not watch-only?)
-       (assoc :on-long-press
-              #(rf/dispatch
-                [:show-bottom-sheet
-                 {:content       (fn [] [token-value-drawer item])
-                  :selected-item (fn [] [quo/token-value item])}])))]))
+  [quo/token-value
+   (merge item
+          {:on-long-press
+           #(rf/dispatch
+             [:show-bottom-sheet
+              {:content       (fn [] [token-value-drawer item])
+               :selected-item (fn [] [quo/token-value item])}])})])
@@ -106,16 +106,6 @@
        total-units-in-all-chains (total-token-units-in-all-chains token)]
    (money/crypto->fiat total-units-in-all-chains price)))

-(defn token-fiat-value
-  "Returns the fiat value for a single token on a given network."
-  [currency raw-balance {:keys [market-values-per-currency]}]
-  (let [price (or (get-in market-values-per-currency
-                          [currency :price])
-                  (get-in market-values-per-currency
-                          [constants/profile-default-currency :price])
-                  0)]
-    (money/crypto->fiat raw-balance price)))
-
 (defn calculate-balance-for-account
  [currency {:keys [tokens] :as _account}]
  (->> tokens
@@ -195,11 +185,6 @@
   constants/arbitrum-chain-id      :arbitrum
   constants/arbitrum-test-chain-id :arbitrum})

-(def short-name->id
-  {:eth  constants/mainnet-chain-id
-   :opt  constants/optimism-chain-id
-   :arb1 constants/arbitrum-chain-id})
-
 (defn get-standard-fiat-format
  [crypto-value currency-symbol fiat-value]
  (if (string/includes? crypto-value "<")
@@ -241,7 +226,3 @@
  [input-string]
  (let [split-result (string/split input-string #"0x")]
    [(first split-result) (str "0x" (second split-result))]))
-
-(defn get-balance-for-chain
-  [data chain-id]
-  (some #(when (= chain-id (:chain-id %)) %) (vals data)))
@@ -9,7 +9,6 @@
    [reagent.core :as reagent]
    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
    [status-im.common.standard-authentication.core :as standard-auth]
-    [status-im.config :as config]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.create-account.style :as style]
@@ -32,9 +31,7 @@
                        :size                :xxs
                        :customization-color account-color}
    :action            :button
-    :action-props      {:on-press    (if (:edit-default-keypair config/wallet-feature-flags)
-                                       #(rf/dispatch [:navigate-to :wallet-select-keypair])
-                                       #(js/alert "feature disabled in config file"))
+    :action-props      {:on-press    #(rf/dispatch [:navigate-to :wallet-select-keypair])
                        :button-text (i18n/label :t/edit)
                        :alignment   :flex-start}
    :description       :text
@@ -43,7 +40,7 @@
    :image             :icon
    :image-props       :i/derivated-path
    :action            :button
-    :action-props      {:on-press    #(js/alert "Coming soon!")
+    :action-props      {:on-press    #(js/alert "Button pressed!")
                        :button-text (i18n/label :t/edit)
                        :icon-left   :i/placeholder
                        :alignment   :flex-start}
@@ -6,6 +6,7 @@
    [status-im.contexts.wallet.data-store :as data-store]
    [status-im.contexts.wallet.events.collectibles]
    [status-im.contexts.wallet.item-types :as item-types]
+    [status-im.contexts.wallet.temp :as temp]
    [taoensso.timbre :as log]
    [utils.ethereum.chain :as chain]
    [utils.ethereum.eip.eip55 :as eip55]
@@ -178,11 +179,6 @@
                                    (first derived-address-details)]))]
     {:fx [[:dispatch [:wallet/create-derived-addresses account-details on-success]]]})))

-(rf/reg-event-fx :wallet/select-bridge-to
- (fn [{:keys [db]} [{:keys [token stack-id]}]]
-   {:db (assoc-in db [:wallet :ui :send :token] token)
-    :fx [[:navigate-to-within-stack [:wallet-bridge-to stack-id]]]}))
-
 (rf/reg-event-fx
 :wallet/get-ethereum-chains
 (fn [_]
@@ -246,15 +242,30 @@


 (rf/reg-event-fx :wallet/fetch-address-suggestions
- (fn [{:keys [db]} [_address]]
+ (fn [{:keys [db]} [address]]
   {:db (assoc db
-               :wallet/local-suggestions     nil
-               :wallet/valid-ens-or-address? false)}))
+               :wallet/local-suggestions
+               (cond
+                 (= address
+                    (get-in
+                     temp/address-local-suggestion-saved-contact-address-mock
+                     [:accounts 0 :address]))
+                 [temp/address-local-suggestion-saved-contact-address-mock]
+                 (= address
+                    (get temp/address-local-suggestion-saved-address-mock
+                         :address))
+                 [temp/address-local-suggestion-saved-address-mock]
+                 :else (temp/find-matching-addresses address))
+               :wallet/valid-ens-or-address?
+               false)}))

 (rf/reg-event-fx :wallet/ens-validation-success
- (fn [{:keys [db]} [_ens]]
+ (fn [{:keys [db]} [ens]]
   {:db (assoc db
-               :wallet/local-suggestions     nil
+               :wallet/local-suggestions     (if (= ens
+                                                    (:ens temp/ens-local-suggestion-saved-address-mock))
+                                               [temp/ens-local-suggestion-saved-address-mock]
+                                               [temp/ens-local-suggestion-mock])
               :wallet/valid-ens-or-address? true)}))

 (rf/reg-event-fx :wallet/address-validation-success
@@ -24,11 +24,9 @@

 (defn displayable-collectible?
  [collectible]
-  (let [{{:keys [image-url animation-url]} :collectible-data
-         {collection-image-url :image-url} :collection-data} collectible]
+  (let [{:keys [image-url animation-url]} (:collectible-data collectible)]
    (or (not (string/blank? animation-url))
-        (not (string/blank? image-url))
-        (not (string/blank? collection-image-url)))))
+        (not (string/blank? image-url)))))

 (defn- add-collectibles-to-accounts
  [accounts collectibles]
@@ -2,7 +2,6 @@
  (:require
    [camel-snake-kebab.core :as csk]
    [camel-snake-kebab.extras :as cske]
-    [clojure.string :as string]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.send.utils :as send-utils]
@@ -58,23 +57,16 @@

 (rf/reg-event-fx :wallet/select-send-address
 (fn [{:keys [db]} [{:keys [address token recipient stack-id]}]]
-   (let [[prefix to-address] (utils/split-prefix-and-address address)
-         prefix-seq          (string/split prefix #":")
-         selected-networks   (mapv #(utils/short-name->id (keyword %)) prefix-seq)]
+   (let [[prefix to-address] (utils/split-prefix-and-address address)]
     {:db (-> db
              (assoc-in [:wallet :ui :send :recipient] (or recipient address))
              (assoc-in [:wallet :ui :send :to-address] to-address)
-              (assoc-in [:wallet :ui :send :address-prefix] prefix)
-              (assoc-in [:wallet :ui :send :selected-networks] selected-networks))
+              (assoc-in [:wallet :ui :send :address-prefix] prefix))
      :fx [[:navigate-to-within-stack
            (if token
              [:wallet-send-input-amount stack-id]
              [:wallet-select-asset stack-id])]]})))

-(rf/reg-event-fx :wallet/update-receiver-networks
- (fn [{:keys [db]} [selected-networks]]
-   {:db (assoc-in db [:wallet :ui :send :selected-networks] selected-networks)}))
-
 (rf/reg-event-fx :wallet/send-select-token
 (fn [{:keys [db]} [{:keys [token stack-id]}]]
   {:db (assoc-in db [:wallet :ui :send :token] token)
@@ -100,11 +92,10 @@
   (let [wallet-address          (get-in db [:wallet :current-viewing-account-address])
         token                   (get-in db [:wallet :ui :send :token])
         account-address         (get-in db [:wallet :ui :send :send-account-address])
-         selected-networks       (get-in db [:wallet :ui :send :selected-networks])
         to-address              (or account-address (get-in db [:wallet :ui :send :to-address]))
         token-decimal           (:decimals token)
         token-id                (:symbol token)
-         network-preferences     selected-networks
+         network-preferences     []
         gas-rates               constants/gas-rate-medium
         amount-in               (send-utils/amount-in-hex amount token-decimal)
         from-address            wallet-address
@@ -44,8 +44,7 @@
                                                  :market-values-per-currency {:usd {:price 10}}}
   :wallet/wallet-send-loading-suggested-routes? false
   :wallet/wallet-send-route                     {:route []}
-   :wallet/wallet-send-suggested-routes          {:candidates []}
-   :wallet/wallet-send-selected-networks         []})
+   :wallet/wallet-send-suggested-routes          {:candidates []}})

 (h/describe "Send > input amount screen"
  (h/setup-restorable-re-frame)
@@ -54,6 +54,13 @@
    (normalize-input current v)
    current))

+(defn- find-affordable-networks
+  [{:keys [balances-per-chain]} input-value]
+  (->> balances-per-chain
+       (filter (fn [[_ {:keys [balance]}]]
+                 (>= (js/parseFloat balance) input-value)))
+       (map first)))
+
 (defn- reset-input-error
  [new-value prev-value input-error]
  (reset! input-error
@@ -122,22 +129,21 @@
                               (<= input-num-value 0)
                               (> input-num-value (:amount @current-limit)))
            amount            (str @input-value " " token-symbol)
-            {:keys [color]}   (rf/sub [:wallet/current-viewing-account])
-            fetch-routes      (fn []
-                                (rf/dispatch [:wallet/clean-suggested-routes])
-                                (when-not (or
-                                           (empty? @input-value)
-                                           (<= input-num-value 0)
-                                           (> input-num-value (:amount @current-limit)))
-                                  (debounce/debounce-and-dispatch [:wallet/get-suggested-routes
-                                                                   @input-value]
-                                                                  100)))]
+            {:keys [color]}   (rf/sub [:wallet/current-viewing-account])]
        (rn/use-effect
         (fn []
           (let [dismiss-keyboard-fn   #(when (= % "active") (rn/dismiss-keyboard!))
                 app-keyboard-listener (.addEventListener rn/app-state "change" dismiss-keyboard-fn)]
             #(.remove app-keyboard-listener))))
-        (rn/use-effect #(fetch-routes) [@input-value])
+        (rn/use-effect (fn []
+                         (rf/dispatch [:wallet/clean-suggested-routes])
+                         (when-not (or
+                                    (empty? @input-value)
+                                    (<= input-num-value 0)
+                                    (> input-num-value (:amount @current-limit)))
+                           (debounce/debounce-and-dispatch [:wallet/get-suggested-routes @input-value]
+                                                           100)))
+                       [@input-value])
        [rn/view
         {:style               style/screen
          :accessibility-label (str "container" (when @input-error "-error"))}
@@ -160,11 +166,10 @@
           :on-change-text  (fn [text]
                              (handle-on-change text))}]
         [routes/view
-          {:amount       amount
-           :routes       suggested-routes
-           :token        token
-           :input-value  @input-value
-           :fetch-routes fetch-routes}]
+          {:amount           amount
+           :routes           suggested-routes
+           :loading-networks (find-affordable-networks token @input-value)
+           :networks         (:networks token)}]
         [quo/bottom-actions
          {:actions             :1-action
           :button-one-label    (i18n/label :t/confirm)
@@ -1,5 +1,4 @@
-(ns status-im.contexts.wallet.send.routes.style
-  (:require [quo.foundations.colors :as colors]))
+(ns status-im.contexts.wallet.send.routes.style)

 (def routes-container
  {:padding-horizontal 20
@@ -31,26 +30,3 @@
  {:flex-grow       1
   :align-items     :center
   :justify-content :center})
-
-(def add-network
-  {:margin-top 8
-   :align-self :flex-end
-   :left       12})
-
-(defn warning-container
-  [color theme]
-  {:flex-direction    :row
-   :border-width      1
-   :border-color      (colors/resolve-color color theme 10)
-   :background-color  (colors/resolve-color color theme 5)
-   :margin-horizontal 20
-   :margin-top        4
-   :margin-bottom     8
-   :padding-left      12
-   :padding-vertical  11
-   :border-radius     12})
-
-(def warning-text
-  {:margin-left   8
-   :margin-right  12
-   :padding-right 12})
@@ -1,134 +1,39 @@
 (ns status-im.contexts.wallet.send.routes.view
  (:require
-    [clojure.string :as string]
    [quo.core :as quo]
-    [quo.foundations.colors :as colors]
-    [quo.foundations.resources :as resources]
-    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [reagent.core :as reagent]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.send.routes.style :as style]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

-(defn- find-affordable-networks
-  [{:keys [balances-per-chain]} input-value selected-networks]
-  (->> balances-per-chain
-       (filter (fn [[_ {:keys [balance chain-id]}]]
-                 (and
-                  (>= (js/parseFloat balance) input-value)
-                  (some #(= % chain-id) selected-networks))))
-       (map first)))
-
-(defn- make-network-item
-  [{:keys [network-name chain-id] :as _network}
-   {:keys [title color on-change network-preferences] :as _options}]
-  {:title        (or title (string/capitalize (name network-name)))
-   :image        :icon-avatar
-   :image-props  {:icon (resources/get-network network-name)
-                  :size :size-20}
-   :action       :selector
-   :action-props {:type                :checkbox
-                  :customization-color color
-                  :checked?            (some #(= % chain-id) @network-preferences)
-                  :on-change           on-change}})
-
-(defn networks-drawer
-  [{:keys [fetch-routes theme]}]
-  (let [network-details     (rf/sub [:wallet/network-details])
-        {:keys [color]}     (rf/sub [:wallet/current-viewing-account])
-        selected-networks   (rf/sub [:wallet/wallet-send-selected-networks])
-        prefix              (rf/sub [:wallet/wallet-send-address-prefix])
-        prefix-seq          (string/split prefix #":")
-        grouped-details     (group-by #(contains? (set prefix-seq) (:short-name %)) network-details)
-        preferred           (get grouped-details true [])
-        not-preferred       (get grouped-details false [])
-        network-preferences (reagent/atom selected-networks)
-        toggle-network      (fn [{:keys [chain-id]}]
-                              (swap! network-preferences
-                                (fn [preferences]
-                                  (if (some #(= % chain-id) preferences)
-                                    (vec (remove #(= % chain-id) preferences))
-                                    (conj preferences chain-id)))))]
-    (fn []
-      [rn/view
-       [quo/drawer-top {:title (i18n/label :t/edit-receiver-networks)}]
-       [quo/category
-        {:list-type :settings
-         :label     (i18n/label :t/preferred-by-receiver)
-         :data      (mapv (fn [network]
-                            (make-network-item network
-                                               {:color               color
-                                                :network-preferences network-preferences
-                                                :on-change           #(toggle-network network)}))
-                          preferred)}]
-       (when (pos? (count not-preferred))
-         [quo/category
-          {:list-type :settings
-           :label     (i18n/label :t/not-preferred-by-receiver)
-           :data      (mapv (fn [network]
-                              (make-network-item network
-                                                 {:color               color
-                                                  :network-preferences network-preferences
-                                                  :on-change           #(toggle-network network)}))
-                            not-preferred)}])
-       (when (not= selected-networks @network-preferences)
-         [rn/view {:style (style/warning-container color theme)}
-          [quo/icon :i/info {:color (colors/resolve-color color theme)}]
-          [quo/text
-           {:size  :paragraph-2
-            :style style/warning-text} (i18n/label :t/receiver-networks-warning)]])
-       [quo/bottom-actions
-        {:button-one-label (i18n/label :t/apply-changes)
-         :button-one-props {:disabled?           (= selected-networks @network-preferences)
-                            :on-press            (fn []
-                                                   (rf/dispatch [:wallet/update-receiver-networks
-                                                                 @network-preferences])
-                                                   (rf/dispatch [:hide-bottom-sheet])
-                                                   (fetch-routes))
-                            :customization-color color}}]])))
-
 (defn route-item
-  [{:keys [amount from-network to-network status theme fetch-routes]}]
-  (if (= status :add)
-    [quo/network-bridge
-     {:status          :add
-      :container-style style/add-network
-      :on-press        #(rf/dispatch [:show-bottom-sheet
-                                      {:content (fn [] [networks-drawer
-                                                        {:theme        theme
-                                                         :fetch-routes fetch-routes}])}])}]
-    [rn/view {:style style/routes-inner-container}
-     [quo/network-bridge
-      {:amount  amount
-       :network from-network
-       :status  status}]
-     (if (= status :default)
-       [quo/network-link
-        {:shape           :linear
-         :source          from-network
-         :destination     to-network
-         :container-style style/network-link}]
-       [rn/view {:style {:width 73}}])
-     [quo/network-bridge
-      {:amount          amount
-       :network         to-network
-       :status          status
-       :container-style {:right 12}}]]))
+  [{:keys [amount from-network to-network status]}]
+  [rn/view {:style style/routes-inner-container}
+   [quo/network-bridge
+    {:amount  amount
+     :network from-network
+     :status  status}]
+   (if (= status :default)
+     [quo/network-link
+      {:shape           :linear
+       :source          from-network
+       :destination     to-network
+       :container-style style/network-link}]
+     [rn/view {:style {:width 73}}])
+   [quo/network-bridge
+    {:amount          amount
+     :network         to-network
+     :status          status
+     :container-style {:right 12}}]])

-(defn- view-internal
-  [{:keys [amount routes token input-value theme fetch-routes]}]
-  (let [selected-networks         (rf/sub [:wallet/wallet-send-selected-networks])
-        loading-networks          (find-affordable-networks token input-value selected-networks)
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        best-routes               (:best routes)
-        data                      (if loading-suggested-routes? loading-networks best-routes)]
-    (if (or (and (not-empty loading-networks) loading-suggested-routes?) (not-empty best-routes))
+(defn view
+  [{:keys [amount routes loading-networks]}]
+  (let [loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+        candidates                (:candidates routes)]
+    (if (or (and (not-empty loading-networks) loading-suggested-routes?) (not-empty candidates))
      [rn/flat-list
-       {:data                    (if (and (< (count data) 3) (pos? (count data)))
-                                   (concat data [{:status :add}])
-                                   data)
+       {:data                    (if loading-suggested-routes? loading-networks candidates)
        :content-container-style style/routes-container
        :header                  [rn/view {:style style/routes-header-container}
                                  [quo/section-label
@@ -140,12 +45,7 @@
        :render-fn               (fn [item]
                                   [route-item
                                    {:amount       amount
-                                     :theme        theme
-                                     :fetch-routes fetch-routes
-                                     :status       (cond
-                                                     (= (:status item) :add)   :add
-                                                     loading-suggested-routes? :loading
-                                                     :else                     :default)
+                                     :status       (if loading-suggested-routes? :loading :default)
                                     :from-network (if loading-suggested-routes?
                                                     (utils/id->network item)
                                                     (utils/id->network (get-in item [:from :chain-id])))
@@ -154,7 +54,5 @@
                                                     (utils/id->network (get-in item
                                                                                [:to :chain-id])))}])}]
      [rn/view {:style style/empty-container}
-       (when (and (not (nil? best-routes)) (not loading-suggested-routes?))
+       (when (and (not (nil? candidates)) (not loading-suggested-routes?))
         [quo/text (i18n/label :t/no-routes-found)])])))
-
-(def view (quo.theme/with-theme view-internal))
@@ -168,13 +168,14 @@
             [local-suggestions-list]]]
           [:<>
            [quo/tabs
-             {:style           style/tabs
-              :container-style style/tabs-content
-              :size            32
-              :default-active  selected-tab
-              :data            tabs-data
-              :scrollable?     true
-              :on-change       on-change-tab}]
+             {:style            style/tabs
+              :container-style  style/tabs-content
+              :size             32
+              :default-active   selected-tab
+              :data             tabs-data
+              :scrollable?      true
+              :scroll-on-press? true
+              :on-change        on-change-tab}]
            [tabs/view {:selected-tab selected-tab}]])]))))

 (defn view
@@ -0,0 +1,124 @@
+(ns status-im.contexts.wallet.temp
+  (:require [clojure.string :as string]
+            [quo.foundations.resources :as quo.resources]
+            [status-im.common.resources :as resources]
+            [status-im.contexts.wallet.item-types :as types]))
+
+(def ens-local-suggestion-saved-address-mock
+  {:type                types/saved-address
+   :name                "Pedro"
+   :ens                 "pedro.eth"
+   :address             "0x4732894732894738294783294723894723984"
+   :customization-color :purple
+   :networks            [{:network-name :ethereum
+                          :short-name   "eth"}
+                         {:network-name :optimism
+                          :short-name   "opt"}]})
+
+(def ens-local-suggestion-mock
+  {:type     types/address
+   :ens      "pedro.eth"
+   :address  "0x4732894732894738294783294723894723984"
+   :networks [{:network-name :ethereum
+               :short-name   "eth"}
+              {:network-name :optimism
+               :short-name   "opt"}]})
+
+(def address-local-suggestion-saved-contact-address-mock
+  {:type                types/saved-contact-address
+   :customization-color :blue
+   :accounts            [{:name                "New House"
+                          :address             "0x62cf6E0Ba4C4530735616e1Ee7ff5FbCB726fBd2"
+                          :emoji               "🍔"
+                          :customization-color :blue}]
+   :contact-props       {:full-name           "Mark Libot"
+                         :profile-picture     (resources/get-mock-image :user-picture-male4)
+                         :customization-color :purple}})
+
+(def address-local-suggestion-saved-address-mock
+  {:type                types/saved-address
+   :name                "Peter Lamborginski"
+   :address             "0x12FaBc34De56Ef78A9B0Cd12Ef3456AbC7D8E9F0"
+   :customization-color :magenta
+   :networks            [{:network-name :ethereum
+                          :short-name   "eth"}
+                         {:network-name :optimism
+                          :short-name   "opt"}]})
+
+(def address-local-suggestion-mock
+  {:type     types/address
+   :address  "0x1233cD34De56Ef78A9B0Cd12Ef3456AbC7123dee"
+   :networks [{:network-name :ethereum
+               :short-name   "eth"}
+              {:network-name :optimism
+               :short-name   "opt"}]})
+
+(defn find-matching-addresses
+  [substring]
+  (let [all-addresses [address-local-suggestion-saved-address-mock
+                       address-local-suggestion-mock]]
+    (vec (filter #(string/starts-with? (:address %) substring) all-addresses))))
+
+(def collectible-activities
+  [{:transaction       :receive
+    :timestamp         "Today 22:20"
+    :status            :finalised
+    :counter           1
+    :first-tag         {:size               24
+                        :type               :collectible
+                        :collectible        (resources/mock-images :collectible)
+                        :collectible-name   "Collectible"
+                        :collectible-number "123"}
+    :second-tag-prefix :t/from
+    :second-tag        {:size            24
+                        :type            :default
+                        :full-name       "Aretha Gosling"
+                        :profile-picture (resources/mock-images :user-picture-female2)}
+    :third-tag-prefix  :t/to
+    :third-tag         {:size         24
+                        :type         :account
+                        :account-name "Piggy bank"
+                        :emoji        "🐷"}
+
+    :fourth-tag-prefix :t/via
+    :fourth-tag        {:size         24
+                        :type         :network
+                        :network-logo (quo.resources/get-network :ethereum)
+                        :network-name "Mainnet"}}
+   {:transaction :mint
+    :timestamp "Yesterday"
+    :status :finalised
+    :counter 1
+    :first-tag {:size               24
+                :type               :collectible
+                :collectible        (resources/mock-images :collectible)
+                :collectible-name   "Collectible"
+                :collectible-number "123"}
+    :second-tag-prefix :t/at
+    :second-tag
+    {:size 24
+     :type :address
+     :address
+     "0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"}
+    :third-tag-prefix :t/on
+    :third-tag {:size         24
+                :type         :network
+                :network-logo (quo.resources/get-network :ethereum)
+                :network-name "Mainnet"}}])
+
+(def collectible-about
+  {:cards [{:title               "BAYC"
+            :icon                :social/link
+            :address             "boredapeyachtclub"
+            :customization-color :social/link
+            :on-press            #(js/alert "pressed")}
+           {:title               "Twitter"
+            :icon                :social/twitter
+            :address             "@BoredApeYC"
+            :customization-color :social/twitter
+            :on-press            #(js/alert "pressed")}
+           {:title               "Opensea"
+            :icon                :social/opensea
+            :address             "Bored Ape Yacht Club"
+            :customization-color :social/opensea
+            :on-press            #(js/alert "pressed")}]})
@@ -2,13 +2,13 @@
  (:require
    [legacy.status-im.ui.screens.screens :as old-screens]
    [status-im.common.emoji-picker.view :as emoji-picker]
-    [status-im.common.lightbox.view :as lightbox]
    [status-im.config :as config]
    [status-im.contexts.chat.group-details.view :as group-details]
    [status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
    [status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
    [status-im.contexts.chat.home.new-chat.view :as new-chat]
    [status-im.contexts.chat.messenger.camera.view :as camera-screen]
+    [status-im.contexts.chat.messenger.lightbox.view :as lightbox]
    [status-im.contexts.chat.messenger.messages.view :as chat]
    [status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
    [status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
@@ -47,7 +47,6 @@
    [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
    [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
    [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
-    [status-im.contexts.wallet.account.bridge-to.view :as bridge-to]
    [status-im.contexts.wallet.account.bridge.view :as bridge]
    [status-im.contexts.wallet.account.view :as wallet-accounts]
    [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch]
@@ -323,10 +322,6 @@
                 :modalPresentationStyle :overCurrentContext}
     :component bridge/view}

-    {:name      :wallet-bridge-to
-     :options   {:insets {:top? true}}
-     :component bridge-to/view}
-
    {:name      :wallet-edit-derivation-path
     :component wallet-edit-derivation-path/view}

@@ -297,62 +297,32 @@
 (fn [collapsed-categories [_ community-id]]
   (get collapsed-categories community-id)))

-(defn- permission-id->permission-value
-  [token-permissions permission-id]
-  (get (into {} token-permissions) permission-id))
-
 (re-frame/reg-sub
 :community/token-gated-overview
 (fn [[_ community-id]]
   [(re-frame/subscribe [:communities/community community-id])])
 (fn [[{:keys [token-permissions-check token-permissions checking-permissions? token-images]}] _]
-   (let [can-request-access? (:satisfied token-permissions-check)
-         role-permissions #{constants/community-token-permission-become-admin
-                            constants/community-token-permission-become-member
-                            constants/community-token-permission-become-token-master
-                            constants/community-token-permission-become-token-owner}
-         highest-permission-role
-         (when can-request-access?
-           (->> token-permissions-check
-                :permissions
-                (reduce-kv
-                 (fn [highest-permission-role permission-id {:keys [criteria]}]
-                   (if-let [permission-type
-                            (and (first criteria)
-                                 (some #{(:type (permission-id->permission-value token-permissions
-                                                                                 permission-id))}
-                                       role-permissions))]
-                     (if highest-permission-role
-                       (min highest-permission-role permission-type)
-                       permission-type)
-                     highest-permission-role))
-                 nil)))
-         highest-permission-role (if (and can-request-access? (nil? highest-permission-role))
-                                   constants/community-token-permission-become-member
-                                   highest-permission-role)]
-     {:can-request-access?     can-request-access?
-      :highest-permission-role highest-permission-role
-      :number-of-hold-tokens   (reduce
-                                (fn [acc [_ {:keys [criteria]}]]
-                                  (reduce #(+ %1 (if %2 1 0)) acc criteria))
-                                0
-                                (:permissions token-permissions-check))
-      :tokens                  (->>
-                                 token-permissions
-                                 (filter (fn [[_ {:keys [type]}]]
-                                           (= type constants/community-token-permission-become-member)))
-                                 (map (fn [[perm-key {:keys [token_criteria]}]]
-                                        (let [check-criteria (get-in token-permissions-check
-                                                                     [:permissions perm-key :criteria])]
-                                          (map
-                                           (fn [{sym :symbol amount :amount} sufficient?]
-                                             {:symbol      sym
-                                              :sufficient? (when (seq check-criteria) sufficient?)
-                                              :loading?    checking-permissions?
-                                              :amount      amount
-                                              :img-src     (get token-images sym)})
-                                           token_criteria
-                                           (or check-criteria token_criteria))))))})))
+   {:can-request-access?   (:satisfied token-permissions-check)
+    :number-of-hold-tokens (reduce
+                            (fn [acc [_ {:keys [criteria]}]]
+                              (reduce #(+ %1 (if %2 1 0)) acc criteria))
+                            0
+                            (:permissions token-permissions-check))
+    :tokens                (->> token-permissions
+                                (filter (fn [[_ {:keys [type]}]]
+                                          (= type constants/community-token-permission-become-member)))
+                                (map (fn [[perm-key {:keys [token_criteria]}]]
+                                       (let [check-criteria (get-in token-permissions-check
+                                                                    [:permissions perm-key :criteria])]
+                                         (map
+                                          (fn [{sym :symbol amount :amount} sufficient?]
+                                            {:symbol      sym
+                                             :sufficient? (when (seq check-criteria) sufficient?)
+                                             :loading?    checking-permissions?
+                                             :amount      amount
+                                             :img-src     (get token-images sym)})
+                                          token_criteria
+                                          (or check-criteria token_criteria))))))}))

 (re-frame/reg-sub
 :community/images
@@ -1,7 +1,6 @@
 (ns status-im.subs.communities-test
  (:require
    [cljs.test :refer [is testing]]
-    matcher-combinators.test
    [re-frame.db :as rf-db]
    [status-im.constants :as constants]
    status-im.subs.communities
@@ -18,7 +17,7 @@
      (swap! rf-db/app-db assoc
        :communities
        raw-communities)
-      (is (match? raw-communities (rf/sub [sub-name]))))))
+      (is (= raw-communities (rf/sub [sub-name]))))))

 (h/deftest-sub :communities/section-list
  [sub-name]
@@ -27,29 +26,29 @@
      :communities
      {"0x1" {:name "civilized monkeys"}
       "0x2" {:name "Civilized rats"}})
-    (is (match? [{:title "C"
-                  :data  [{:name "civilized monkeys"}
-                          {:name "Civilized rats"}]}]
-                (rf/sub [sub-name]))))
+    (is (= [{:title "C"
+             :data  [{:name "civilized monkeys"}
+                     {:name "Civilized rats"}]}]
+           (rf/sub [sub-name]))))

  (testing "sorts by section ascending"
    (swap! rf-db/app-db assoc
      :communities
      {"0x3" {:name "Memorable"}
       "0x1" {:name "Civilized monkeys"}})
-    (is (match? [{:title "C" :data [{:name "Civilized monkeys"}]}
-                 {:title "M" :data [{:name "Memorable"}]}]
-                (rf/sub [sub-name]))))
+    (is (= [{:title "C" :data [{:name "Civilized monkeys"}]}
+            {:title "M" :data [{:name "Memorable"}]}]
+           (rf/sub [sub-name]))))

  (testing "builds default section for communities without a name"
    (swap! rf-db/app-db assoc
      :communities
      {"0x2" {:id "0x2"}
       "0x1" {:id "0x1"}})
-    (is (match? [{:title ""
-                  :data  [{:id "0x2"}
-                          {:id "0x1"}]}]
-                (rf/sub [sub-name])))))
+    (is (= [{:title ""
+             :data  [{:id "0x2"}
+                     {:id "0x1"}]}]
+           (rf/sub [sub-name])))))

 (h/deftest-sub :communities/unviewed-counts
  [sub-name]
@@ -65,17 +64,17 @@
       "0x102" {:community-id            community-id
                :unviewed-mentions-count 5
                :unviewed-messages-count 1}})
-    (is (match? {:unviewed-messages-count 3
-                 :unviewed-mentions-count 8}
-                (rf/sub [sub-name community-id]))))
+    (is (= {:unviewed-messages-count 3
+            :unviewed-mentions-count 8}
+           (rf/sub [sub-name community-id]))))

  (testing "defaults to zero when count keys are not present"
    (swap! rf-db/app-db assoc
      :chats
      {"0x100" {:community-id community-id}})
-    (is (match? {:unviewed-messages-count 0
-                 :unviewed-mentions-count 0}
-                (rf/sub [sub-name community-id])))))
+    (is (= {:unviewed-messages-count 0
+            :unviewed-mentions-count 0}
+           (rf/sub [sub-name community-id])))))

 (h/deftest-sub :communities/categorized-channels
  [sub-name]
@@ -351,16 +350,16 @@
    (swap! rf-db/app-db assoc
      :communities/my-pending-requests-to-join
      {})
-    (is (match? {}
-                (rf/sub [sub-name]))))
+    (is (= {}
+           (rf/sub [sub-name]))))
  (testing "users requests to join different communities"
    (swap! rf-db/app-db assoc
      :communities/my-pending-requests-to-join
      {:community-id-1 {:id :request-id-1}
       :community-id-2 {:id :request-id-2}})
-    (is (match? {:community-id-1 {:id :request-id-1}
-                 :community-id-2 {:id :request-id-2}}
-                (rf/sub [sub-name])))))
+    (is (= {:community-id-1 {:id :request-id-1}
+            :community-id-2 {:id :request-id-2}}
+           (rf/sub [sub-name])))))

 (h/deftest-sub :communities/my-pending-request-to-join
  [sub-name]
@@ -368,15 +367,15 @@
    (swap! rf-db/app-db assoc
      :communities/my-pending-requests-to-join
      {})
-    (is (match? nil
-                (rf/sub [sub-name :community-id-1]))))
+    (is (= nil
+           (rf/sub [sub-name :community-id-1]))))
  (testing "users request to join a specific communities"
    (swap! rf-db/app-db assoc
      :communities/my-pending-requests-to-join
      {:community-id-1 {:id :request-id-1}
       :community-id-2 {:id :request-id-2}})
-    (is (match? :request-id-1
-                (rf/sub [sub-name :community-id-1])))))
+    (is (= :request-id-1
+           (rf/sub [sub-name :community-id-1])))))

 (h/deftest-sub :community/token-gated-overview
  [sub-name]
@@ -386,7 +385,6 @@
     community {:id                      community-id
                :checking-permissions?   checking-permissions?
                :permissions             {:access 3}
-                :highest-permission-role constants/community-token-permission-become-admin
                :token-images            {"ETH" token-image-eth}
                :token-permissions       [[:permission-id-01
                                           {:id "permission-id-01"
@@ -453,14 +451,14 @@
                :outroMessage            "bla"
                :verified                false}]
    (swap! rf-db/app-db assoc-in [:communities community-id] community)
-    (is (match? {:can-request-access?   true
-                 :number-of-hold-tokens 2
-                 :tokens                [[{:symbol      "ETH"
-                                           :amount      "0.001"
-                                           :sufficient? nil
-                                           :loading?    checking-permissions?
-                                           :img-src     token-image-eth}]]}
-                (rf/sub [sub-name community-id])))))
+    (is (= {:can-request-access?   true
+            :number-of-hold-tokens 2
+            :tokens                [[{:symbol      "ETH"
+                                      :amount      "0.001"
+                                      :sufficient? nil
+                                      :loading?    checking-permissions?
+                                      :img-src     token-image-eth}]]}
+           (rf/sub [sub-name community-id])))))

 (h/deftest-sub :communities/airdrop-account
  [sub-name]
@@ -23,7 +23,7 @@
 ;;view
 (reg-root-key-sub :view-id :view-id)
 (reg-root-key-sub :screen-params :navigation/screen-params)
-(reg-root-key-sub :animation-shared-element-id :animation-shared-element-id)
+(reg-root-key-sub :shared-element-id :shared-element-id)

 ;;bottom sheet
 (reg-root-key-sub :bottom-sheet :bottom-sheet)
@@ -3,39 +3,17 @@
    [clojure.string :as string]
    [re-frame.core :as re-frame]))

-(defn- svg-animation?
-  [url media-type]
-  (and (not (string/blank? url))
-       (string/includes? media-type "svg")))
-
-(defn- animation?
-  [url media-type]
-  (and (not (string/blank? url))
-       (not (string/blank? media-type))))
-
 (defn- preview-url
-  [{{collectible-image-url :image-url
-     animation-url         :animation-url
-     animation-media-type  :animation-media-type} :collectible-data
-    {collection-image-url :image-url}             :collection-data}]
-  (cond
-    (svg-animation? animation-url animation-media-type)
-    {:uri  animation-url
-     :svg? true}
-
-    (animation? animation-url animation-media-type)
-    {:uri animation-url}
-
-    (not (string/blank? collectible-image-url))
-    {:uri collectible-image-url}
-
-    :else
-    {:uri collection-image-url}))
+  [{:keys [image-url animation-url animation-media-type]}]
+  (if (and (not (string/blank? animation-url))
+           (not= animation-media-type "image/svg+xml"))
+    animation-url
+    image-url))

 (defn add-collectibles-preview-url
  [collectibles]
-  (map (fn [collectible]
-         (assoc collectible :preview-url (preview-url collectible)))
+  (map (fn [{:keys [collectible-data] :as collectible}]
+         (assoc collectible :preview-url (preview-url collectible-data)))
       collectibles))

 (re-frame/reg-sub
@@ -69,7 +47,7 @@
 :<- [:wallet]
 (fn [wallet]
   (let [last-collectible (:last-collectible-details wallet)]
-     (assoc last-collectible :preview-url (preview-url last-collectible)))))
+     (assoc last-collectible :preview-url (preview-url (:collectible-data last-collectible))))))

 (re-frame/reg-sub
 :wallet/last-collectible-details-chain-id
@@ -48,11 +48,6 @@
 :<- [:wallet/wallet-send]
 :-> :address-prefix)

-(rf/reg-sub
- :wallet/wallet-send-selected-networks
- :<- [:wallet/wallet-send]
- :-> :selected-networks)
-
 (rf/reg-sub
 :wallet/wallet-send-route
 :<- [:wallet/wallet-send]
@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "1256d8121e6fae4fc4517736a271624e473d5417",
-    "commit-sha1": "1256d8121e6fae4fc4517736a271624e473d5417",
-    "src-sha256": "0v9pbb79r8avvlx6ss7czj2j3s8csb2j2gkwavjbya6bys80hqmf"
+    "version": "v0.172.6",
+    "commit-sha1": "6e30fbb211b0e0bb1e7966cce4e215c4080aac5c",
+    "src-sha256": "1k3hg2m25qvgvqxmy8im3xhjwvdyvaq49yks92642h9rw494nb94"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibrkhalil	50759346c4	lint	2024-01-25 10:02:04 +02:00
Ibrkhalil	98811e3511	PR comments	2024-01-25 09:33:11 +02:00
Ibrkhalil	818b9e2bdf	approach	2024-01-25 09:33:10 +02:00
Ibrkhalil	a79c3ad0bf	Text Jumping Issue in Maximized Composer on iOS 17.x	2024-01-25 09:33:08 +02:00