fix_: random empty account

chore: Compress syncing images (#20907 )
Change order of bottom tabs and select wallet-stack as default tab (#21240 )
2024-09-11 19:31:03 +08:00 · 2024-09-10 20:06:46 -03:00 · 2024-09-10 19:41:34 +05:30 · 2024-09-10 15:59:18 +03:00 · 2024-09-09 17:19:10 -06:00 · 2024-09-09 14:43:36 -06:00
190 changed files with 4820 additions and 2908 deletions
@@ -1,8 +1,8 @@
 ---
-name: MVPBug Report
-about: MVPBug Report
+name: Bug Report
+about: Bug Report
 title: ''
-labels: ['E:Mobile Bug MVP', ':1234: low prio']
+labels: ['bug', ':1234: low prio']
 assignees: ''

 ---
@@ -211,7 +211,7 @@ android {
            reset()
            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk false
+            universalApk getEnvOrConfig('ORG_GRADLE_PROJECT_universalApk').toBoolean()
        }
    }
    signingConfigs {
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

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

 import groovy.json.JsonBuilder

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

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

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

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

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

 pipeline {

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

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

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.9.9'

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

 pipeline {
  agent {
@@ -907,7 +907,7 @@ PODS:
    - React-Core
  - react-native-blob-util (0.13.18):
    - React-Core
-  - react-native-blur (4.4.0):
+  - react-native-blur (4.4.1):
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
@@ -1115,7 +1115,7 @@ PODS:
    - React-perflogger (= 0.73.5)
  - ReactNativeAudioToolkit (2.0.3):
    - React
-  - ReactNativeCameraKit (14.0.0-beta13):
+  - ReactNativeCameraKit (14.0.0-beta15):
    - React-Core
  - ReactNativeNavigation (7.39.0):
    - HMSegmentedControl
@@ -1485,7 +1485,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
  FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 530710e7949eb12c82670bd09e946becf50a3c2a
+  glog: 36c15c01d70ed395c6e4f3619f98a23ee415b07a
  hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1515,7 +1515,7 @@ SPEC CHECKSUMS:
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: 799045500f56146afc46245148080e7b7623cb75
+  react-native-blur: b2b140d3d65077a1d5d26be62d9415f895592344
  react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
  react-native-compat: 3af9add14d349701306d3d052638435f6795ac2c
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
@@ -1551,7 +1551,7 @@ SPEC CHECKSUMS:
  React-utils: 987a4526a2fc0acdfaf87888adfe0bf9d0452066
  ReactCommon: 2947b0bffd82ea0e58ca7928881152d4c6dae9af
  ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeCameraKit: d95d3e19c514526a234d9f93c6db7e7f10eef9ea
+  ReactNativeCameraKit: 71343efc1256720184ce980f164c7eedb78d5c16
  ReactNativeNavigation: 679d8c8bf3b8ae98d285bce810964d10da85dbdb
  RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb
  RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
@@ -10,7 +10,7 @@
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */; };
+		22A6156314445AACCFBFE214 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B65AA8037F445B3B691C9ED /* libPods-Status-StatusImPR.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
@@ -36,17 +36,16 @@
 		3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; };
+		48BD7F7AF5283037BD52E49A /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A04127DCB75F4E318A4EBEDD /* libPods-Status-StatusIm-StatusImTests.a */; };
 		57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; };
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
-		67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -59,6 +58,7 @@
 		C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
+		D34A0845D23EC8E3D30E11B1 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84687C28206CB8457AF2BE74 /* libPods-Status-StatusIm.a */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
 /* End PBXBuildFile section */
@@ -108,14 +108,14 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		064C446A8C45E401B63D0B7C /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		337641435F36F3900FEAA11C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,37 +123,37 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
-		5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
+		6B65AA8037F445B3B691C9ED /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
+		84687C28206CB8457AF2BE74 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		8C0C93A4288955E6949CAFA7 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
+		9C8831EF82FB144215B28760 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
+		A04127DCB75F4E318A4EBEDD /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
-		A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
+		C1244846434197B450E92912 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
-		E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		E15A67A7A7B33C177372338A /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				48BD7F7AF5283037BD52E49A /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */,
+				D34A0845D23EC8E3D30E11B1 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */,
+				22A6156314445AACCFBFE214 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */,
-				A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */,
-				0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */,
+				84687C28206CB8457AF2BE74 /* libPods-Status-StatusIm.a */,
+				A04127DCB75F4E318A4EBEDD /* libPods-Status-StatusIm-StatusImTests.a */,
+				6B65AA8037F445B3B691C9ED /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */,
-				5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */,
-				E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */,
-				D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */,
+				064C446A8C45E401B63D0B7C /* Pods-Status-StatusIm.debug.xcconfig */,
+				8C0C93A4288955E6949CAFA7 /* Pods-Status-StatusIm.release.xcconfig */,
+				E15A67A7A7B33C177372338A /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				337641435F36F3900FEAA11C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				C1244846434197B450E92912 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				9C8831EF82FB144215B28760 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,12 +341,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */,
+				78DBDF1BD1055E83A260EA98 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */,
-				A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */,
+				0564BBB140EB57AD57BEEAEA /* [CP] Embed Pods Frameworks */,
+				ED9B7873F01EB9B1500CE371 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -362,15 +362,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */,
+				410DB9615D9ED5009FD09DB3 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */,
-				BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */,
+				CACB1A448509663CCC23DAD5 /* [CP] Embed Pods Frameworks */,
+				3CD62FBC6B5F738846AA62DD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -385,15 +385,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */,
+				59C011634B62CD4307167A35 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */,
-				B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */,
+				189EFE1146C70E755688AF3D /* [CP] Embed Pods Frameworks */,
+				B4118C9690A731BE596936B2 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -547,35 +547,13 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n";
 		};
-		236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */ = {
+		0564BBB140EB57AD57BEEAEA /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -584,7 +562,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		189EFE1146C70E755688AF3D /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
@@ -615,113 +611,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
-		5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */ = {
+		3CD62FBC6B5F738846AA62DD /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -745,7 +635,29 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */ = {
+		410DB9615D9ED5009FD09DB3 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		59C011634B62CD4307167A35 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -767,6 +679,70 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		78DBDF1BD1055E83A260EA98 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		B4118C9690A731BE596936B2 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		CACB1A448509663CCC23DAD5 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -781,6 +757,30 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
+		ED9B7873F01EB9B1500CE371 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -828,7 +828,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = E15A67A7A7B33C177372338A /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -865,7 +865,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 337641435F36F3900FEAA11C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -898,7 +898,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 064C446A8C45E401B63D0B7C /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -980,7 +980,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 8C0C93A4288955E6949CAFA7 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1055,7 +1055,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = C1244846434197B450E92912 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1135,7 +1135,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 9C8831EF82FB144215B28760 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -7827,16 +7827,16 @@
  },

  {
-    "path": "com/github/Dimezis/BlurView/version-2.0.3",
+    "path": "com/github/Dimezis/BlurView/version-2.0.4",
    "repo": "https://jitpack.io",
    "files": {
-      "BlurView-version-2.0.3.pom": {
-        "sha1": "678c8558151c1f1f37ab3e5e8baf00f1306ab6f5",
-        "sha256": "sha256-mgYP/aKUkj/GVVA6AxQhH1NTO0Ssv430blX/wYmImtI="
+      "BlurView-version-2.0.4.pom": {
+        "sha1": "48eab3169b9a4ee3167ed1ed5f9c35135e9e4dad",
+        "sha256": "sha256-DjaiZmuM2CoTmZ4C+6HnNcsjc31ZYaWZSv6A0SCmmjk="
      },
-      "BlurView-version-2.0.3.aar": {
-        "sha1": "1a6b90b3dbd0714e0f9fd3a09196072c7da300a0",
-        "sha256": "sha256-BuP74/LeQ+ID03WYU0m76TIRNGG0fi4ZM+In6RPQ66E="
+      "BlurView-version-2.0.4.aar": {
+        "sha1": "c7d8a6464a50b430b01ce1a25f7949b75ba359b8",
+        "sha256": "sha256-w+KXiNSn0WoszuUpcxIp/M162Z+4vB30FeFvWKd1mcg="
      }
    }
  },
@@ -8169,20 +8169,20 @@
  },

  {
-    "path": "commons-logging/commons-logging/1.3.3",
+    "path": "commons-logging/commons-logging/1.3.4",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "commons-logging-1.3.3.pom": {
-        "sha1": "c5b1495adcb6d090cc4d333bb20e0583e716dd3d",
-        "sha256": "sha256-El1hQurD93REC6cCwF8o+eCYxS0QcSrhFJast3EGs7o="
+      "commons-logging-1.3.4.pom": {
+        "sha1": "e919eab34a66d31a9bbe15ddc563d7d2e6770826",
+        "sha256": "sha256-1L2jSJKqzL9PrTP8MjqKqQfvnXmYRlnaJJRMCoa/CGU="
      },
-      "commons-logging-1.3.3-api.jar": {
-        "sha1": "37cf34db3776550d413a8a0647937a2f38a017d4",
-        "sha256": "sha256-rgQB93pp8ZBAvucmTyrKilQEej0ALtAy2SAK9+beyaE="
+      "commons-logging-1.3.4-api.jar": {
+        "sha1": "de4050262dfa7522365a9e3c76ed8cf4683fcffa",
+        "sha256": "sha256-X1zVkiUzQHDbaxctBaaFuEei+tY+WxjtAjqqpeErgh8="
      },
-      "commons-logging-1.3.3.jar": {
-        "sha1": "580ad1a4f34876c4f964c083361de31b3d60be68",
-        "sha256": "sha256-WCj5bAnYhvmxoJk8eASyfPT87IU0UXFk9RN6yLZ+qbk="
+      "commons-logging-1.3.4.jar": {
+        "sha1": "b9fc14968d63a8b8a8a2c1885fe3e90564239708",
+        "sha256": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY="
      }
    }
  },
@@ -11249,16 +11249,16 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_annotations/2.29.2",
+    "path": "com/google/errorprone/error_prone_annotations/2.31.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "error_prone_annotations-2.29.2.pom": {
-        "sha1": "cfee55ebd44b9c9e37fdcff10480534efb6d2c7f",
-        "sha256": "sha256-kTQi309RAUHmSkGaqK7Tz223itOMacz9Yk0H14HhHOg="
+      "error_prone_annotations-2.31.0.pom": {
+        "sha1": "6dcb31c7f3a4d987eb16c774050af00a3fbe0e25",
+        "sha256": "sha256-eF8uQKPgiapy2Mi8dYqkht3nYyh5R0PzHMWxzsyboQI="
      },
-      "error_prone_annotations-2.29.2.jar": {
-        "sha1": "23bbed35f2d071c8507984834e3e6438c7fee7d2",
-        "sha256": "sha256-4KQmskSa8jI8+1Obcp5b5vTWXHIHXJt7GMjofmOsRow="
+      "error_prone_annotations-2.31.0.jar": {
+        "sha1": "c3ba307b915d6d506e98ffbb49e6d2d12edad65b",
+        "sha256": "sha256-uo0g+x/BgWclUrMj88dUmzC+HVfEndWDXicp52R9nPo="
      }
    }
  },
@@ -11396,12 +11396,12 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_parent/2.29.2",
+    "path": "com/google/errorprone/error_prone_parent/2.31.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "error_prone_parent-2.29.2.pom": {
-        "sha1": "ca40178525396238286615831558689d408ae77a",
-        "sha256": "sha256-kplMj0wsSDM2GENtNmOQNGyqLtt26WAAy96sp+ISTNI="
+      "error_prone_parent-2.31.0.pom": {
+        "sha1": "2b0940b07047f8a2cdbd5f66305c89543d220b6d",
+        "sha256": "sha256-b/rV7o16qMAvSMNw+XGL4NThyZJnRodJZOo5eQb403Y="
      }
    }
  },
@@ -11595,27 +11595,27 @@
  },

  {
-    "path": "com/google/guava/guava-parent/33.2.1-jre",
+    "path": "com/google/guava/guava-parent/33.3.0-jre",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "guava-parent-33.2.1-jre.pom": {
-        "sha1": "fc55955fab23e86fad230acc81bf570deb5660bd",
-        "sha256": "sha256-kJX22O43ZZUCB1EHhYMMwigOeBBnkV+pnP4XQNSGXBQ="
+      "guava-parent-33.3.0-jre.pom": {
+        "sha1": "24b614a34a06ced7c0fba8f4314c0e2d25bc75d6",
+        "sha256": "sha256-tGueFpaKrkokgTgA9nduyJEYjXvQCXpIqfSgyW1oUQg="
      }
    }
  },

  {
-    "path": "com/google/guava/guava-testlib/33.2.1-jre",
+    "path": "com/google/guava/guava-testlib/33.3.0-jre",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "guava-testlib-33.2.1-jre.pom": {
-        "sha1": "3b95376190925f23c89d9f2f990f2eb0bab9d2b2",
-        "sha256": "sha256-ZAiayFTlu6dVYLw9PB/dPqQ1cpFXJvYMgjcsq/qnTuQ="
+      "guava-testlib-33.3.0-jre.pom": {
+        "sha1": "5f3de794ff17706477e4b0f9a7e66c06d417eded",
+        "sha256": "sha256-lZrMVGkZCDw1CP/b5UotvUgT0Ly6Ox+PXr4m6CPc9F0="
      },
-      "guava-testlib-33.2.1-jre.jar": {
-        "sha1": "ba7d569795211c283c4576d17528534a618a5d59",
-        "sha256": "sha256-XsFBByZYQk9AzTC5FGf1zmPA5he5Hskn33JW79/S2Eo="
+      "guava-testlib-33.3.0-jre.jar": {
+        "sha1": "e4b14a9d25332bcd3130147741d1033e9c17577b",
+        "sha256": "sha256-YtAKfjK838Va9k2pU7alaBdNud2l17XP5p6Xi+lWFC8="
      }
    }
  },
@@ -11801,20 +11801,20 @@
  },

  {
-    "path": "com/google/guava/guava/33.2.1-jre",
+    "path": "com/google/guava/guava/33.3.0-jre",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "guava-33.2.1-jre.pom": {
-        "sha1": "5f72123f1bb7d99af8b4a67745fb8309b73a6294",
-        "sha256": "sha256-QoF73BwMjHN9a0Ec+vSoR2nn0nHoebAW/QhQJIoG2rU="
+      "guava-33.3.0-jre.pom": {
+        "sha1": "7ccfd20558d84416c3c0385e569d116a45202269",
+        "sha256": "sha256-08vQUY6vq2qXi7bKP/mDM93+c2eEtr/cSZVD8MlyP4Q="
      },
-      "guava-33.2.1-jre.jar": {
-        "sha1": "818e780da2c66c63bbb6480fef1f3855eeafa3e4",
-        "sha256": "sha256-RSstl4e302b6jPXtmhxAQEVC0F7/p6WY2gO7u7dtnzE="
+      "guava-33.3.0-jre.jar": {
+        "sha1": "13b4d0924e6023eda04b4c7aa83b32dfedf735a7",
+        "sha256": "sha256-363DvOMQHv8UUqrkfXyDP+5EO0e9+e8TMRtsfKtmPd8="
      },
-      "guava-33.2.1-jre.module": {
-        "sha1": "35b3a43a28bf269178f01d7097263d9ef95cac8b",
-        "sha256": "sha256-0j7aahwsC9JfijNGzd7sQ7Ufdb+Bm5MeqpgybqZEdCI="
+      "guava-33.3.0-jre.module": {
+        "sha1": "cbecd20bbaeca674a8147adf68dfa89a6a787ce4",
+        "sha256": "sha256-1WIerA4Z7qfdIY6zVMRyY+fuaT6d47rSUFS3BGSd6xw="
      }
    }
  },
@@ -11987,12 +11987,12 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-bom/4.28.0-RC1",
+    "path": "com/google/protobuf/protobuf-bom/4.28.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-bom-4.28.0-RC1.pom": {
-        "sha1": "4dd88f5b489f6b1bb9a8db169ea31d66464d68a0",
-        "sha256": "sha256-mDFWhesHjFhmjSZ0NCqMd2emZECyz09XbTE0RgUhsZU="
+      "protobuf-bom-4.28.0.pom": {
+        "sha1": "5bf7899c5c7379d943a8dfe0d3dc3050bd355937",
+        "sha256": "sha256-/IKQtwylLUdGnrkDiZIxq4AErHriK7Y9liy4pMKN+yI="
      }
    }
  },
@@ -12238,16 +12238,16 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-java/4.28.0-RC1",
+    "path": "com/google/protobuf/protobuf-java/4.28.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-java-4.28.0-RC1.pom": {
-        "sha1": "abb2a5ec826f29096389ee99365dba30c588c1d0",
-        "sha256": "sha256-3fQIOV7ElhjT1+SsDhRTXZZZYp7HGdC29kbIB/PKHXk="
+      "protobuf-java-4.28.0.pom": {
+        "sha1": "3a5c745b6559c8390f3675c82a7930be4ae56218",
+        "sha256": "sha256-HcGj/bW9SsaySg0sG5ur3MYAVd3SgY/6KTpbHBXVDZE="
      },
-      "protobuf-java-4.28.0-RC1.jar": {
-        "sha1": "a7155c9ba741e2fbe3bfcd1ee5f01c2b220ee52b",
-        "sha256": "sha256-dJDPv1YH7q/TIA4ahs+mlZU8hJ1Mz2EsxlVTUT1oXGI="
+      "protobuf-java-4.28.0.jar": {
+        "sha1": "8b7f76d4c3179132637581aad5fb8207c992943a",
+        "sha256": "sha256-rSOIR3s7lplCQeZHMaE2iU3J/tbeufJ21ISosXGxRQw="
      }
    }
  },
@@ -12367,12 +12367,12 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-parent/4.28.0-RC1",
+    "path": "com/google/protobuf/protobuf-parent/4.28.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-parent-4.28.0-RC1.pom": {
-        "sha1": "f026cdea76c72c34f2a7d2f8fb8874659bc6f18a",
-        "sha256": "sha256-7/Ndud7DbgafiR9Gw40TdRreYRjwzqR3P/ITBAF7+bw="
+      "protobuf-parent-4.28.0.pom": {
+        "sha1": "73d01263876ac4882426dfedb3f800feff999ad2",
+        "sha256": "sha256-86/a3a2isVeXySHBmyFehgbJ/doc6r+ws1xPwrxjEKE="
      }
    }
  },
@@ -14322,16 +14322,16 @@
  },

  {
-    "path": "io/netty/netty-tcnative-classes/2.0.65.Final",
+    "path": "io/netty/netty-tcnative-classes/2.0.66.Final",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "netty-tcnative-classes-2.0.65.Final.pom": {
-        "sha1": "bd8a6acaadbcb7b0beed1459e630fd46ee6c029d",
-        "sha256": "sha256-Vckic4c3c+lUvHjpJnvPGIr5Mz9Idi2GKMm9mawVy2Q="
+      "netty-tcnative-classes-2.0.66.Final.pom": {
+        "sha1": "75dca372aa373fac57023721582360f84c79e44c",
+        "sha256": "sha256-SULNAuKRbB+094zKiEHw9yGbuQ+CirdImokCfC76kes="
      },
-      "netty-tcnative-classes-2.0.65.Final.jar": {
-        "sha1": "3a7aecd4bcaf75c7b0b02c26ea6ceacf3e8f5f4d",
-        "sha256": "sha256-hO8CQa2htO2SeF4QwW7b6wYzSJWaOw73QHErrdCfoSg="
+      "netty-tcnative-classes-2.0.66.Final.jar": {
+        "sha1": "9588bd2f891157538a78d86c945aa34bf9308dda",
+        "sha256": "sha256-ZpqBGhk9wefJ74bLVHpKuS8PNMzo+bhCuQKb9c+gfMU="
      }
    }
  },
@@ -14348,12 +14348,12 @@
  },

  {
-    "path": "io/netty/netty-tcnative-parent/2.0.65.Final",
+    "path": "io/netty/netty-tcnative-parent/2.0.66.Final",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "netty-tcnative-parent-2.0.65.Final.pom": {
-        "sha1": "a02a4d4968be1e5bce30e178be6d3360afcee916",
-        "sha256": "sha256-KqThVEhalgFdM81wRayS86Znkbt3uQVAMLoupdmufeY="
+      "netty-tcnative-parent-2.0.66.Final.pom": {
+        "sha1": "91784588e56a54734c698f08118b4f3b94a58ec1",
+        "sha256": "sha256-KwF/s8He6rXR6uvsE0ZZt96ueMFNXr/D1JwLMITqc2U="
      }
    }
  },
@@ -14816,16 +14816,16 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy-agent/1.14.15",
+    "path": "net/bytebuddy/byte-buddy-agent/1.15.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-agent-1.14.15.pom": {
-        "sha1": "38dc80ceffcc2eb5a333a91178e2b604d79acc4c",
-        "sha256": "sha256-bSndpffrUMo7o7ChKu9RjMVtgjSjNEKl+pgrS0SAJl4="
+      "byte-buddy-agent-1.15.0.pom": {
+        "sha1": "d531511349a70f14bd389df3a934b7c8192db809",
+        "sha256": "sha256-S4Q27/woLIRlbTEbO9aeFGPROSRw8rZ0tBsQ4oIDL40="
      },
-      "byte-buddy-agent-1.14.15.jar": {
-        "sha1": "0b4cc9d88d5de562bf75b3a54ab436ad01b3f72d",
-        "sha256": "sha256-PvbscXWAE2EXAGfMaQKWn5ZtN8cr+TU9nNKCJjsYQGQ="
+      "byte-buddy-agent-1.15.0.jar": {
+        "sha1": "e32740c43acebaac9d55b86399ecf6a5df3c17fb",
+        "sha256": "sha256-M5mg/fe6PxOG6/gxpwYDdCjxsa+B1lPCXPio/eLk0uo="
      }
    }
  },
@@ -14853,23 +14853,23 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy-parent/1.14.15",
+    "path": "net/bytebuddy/byte-buddy-parent/1.14.18",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-parent-1.14.15.pom": {
-        "sha1": "41a33be695a3bbf89c995e2d53433f4cbaa3ac81",
-        "sha256": "sha256-JurvCGUf+li6KQCSzjKBeC4pwGKKG3n6WjeE+Qi0GKw="
+      "byte-buddy-parent-1.14.18.pom": {
+        "sha1": "6b0b1f08e2d2d8166176c80fd22ee3198a26a3cf",
+        "sha256": "sha256-dpxdCxEV5z9oRSu6qjVrrZtzfV/ge4PUyeSDl1uB/jw="
      }
    }
  },

  {
-    "path": "net/bytebuddy/byte-buddy-parent/1.14.17",
+    "path": "net/bytebuddy/byte-buddy-parent/1.15.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-parent-1.14.17.pom": {
-        "sha1": "c4c18b6ee78934ded11c060ca0dcbfffafa76105",
-        "sha256": "sha256-BuV7Xpn99O82iv/SNmF5CyO/MtLQE7vAjWjUNFAG9YI="
+      "byte-buddy-parent-1.15.0.pom": {
+        "sha1": "c626fc5c3eedf76a2bf10d736641de1953ba9638",
+        "sha256": "sha256-jsJH4HfN925yrSuZGVds8qR3gRk1tWyKJ5WOcpe08Ys="
      }
    }
  },
@@ -14905,31 +14905,31 @@
  },

  {
-    "path": "net/bytebuddy/byte-buddy/1.14.15",
+    "path": "net/bytebuddy/byte-buddy/1.14.18",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-1.14.15.pom": {
-        "sha1": "95fc2fd8a131fad0706f51d6b573ece01763572c",
-        "sha256": "sha256-1WOfj+J86tM+akx4n62OZfMo9iu3na0r3XrmzJO5RUw="
+      "byte-buddy-1.14.18.pom": {
+        "sha1": "5f889814c247762909c7007bdf5ef72f2e7cea7a",
+        "sha256": "sha256-IvsZB4/nBkirYFSSZscUaZaEciaqbm9+iP7MCBRySTk="
      },
-      "byte-buddy-1.14.15.jar": {
-        "sha1": "11c9440bc7f9468761e5a82778a05205169d49a9",
-        "sha256": "sha256-dHLjlhmSwSqf1PbWfCHeQoCr4Y8pJwTdSdczgon4rPU="
+      "byte-buddy-1.14.18.jar": {
+        "sha1": "0081e9b9a20944626e6757b5950676af901c2485",
+        "sha256": "sha256-UhF68WlqU6p3wTE1MHStolzL3y31EfKvM/rWcE+pUQQ="
      }
    }
  },

  {
-    "path": "net/bytebuddy/byte-buddy/1.14.17",
+    "path": "net/bytebuddy/byte-buddy/1.15.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "byte-buddy-1.14.17.pom": {
-        "sha1": "0ec01a78f3832e5116bdb7b702cc30239df9832c",
-        "sha256": "sha256-7bLCWR4YBeoRfZojYVWGzGMh0lDokqnTRNwJ1aIr0T4="
+      "byte-buddy-1.15.0.pom": {
+        "sha1": "6cac0a8c84a08406c584e90f2cfcef0bfce9d444",
+        "sha256": "sha256-7U0nIWQBxctujxbAn7/UYGebkMQ6Az2NDnsR5Fz7Tlg="
      },
-      "byte-buddy-1.14.17.jar": {
-        "sha1": "a8d08f3c1e75ecc7f38a8cfd7e9fa47919096373",
-        "sha256": "sha256-zej4+OB7/zaUqs4NmUS6dVZlpYOwXZFT1BBiKF6aimE="
+      "byte-buddy-1.15.0.jar": {
+        "sha1": "a5b1159b91c5334015de0f22ab4b1188cd42bbff",
+        "sha256": "sha256-x0PPtNsebGevYpf74yo62UcQiEzeTH7ssbrX2CDU8ro="
      }
    }
  },
@@ -15256,27 +15256,27 @@
  },

  {
-    "path": "org/antlr/antlr4-master/4.13.1",
+    "path": "org/antlr/antlr4-master/4.13.2",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "antlr4-master-4.13.1.pom": {
-        "sha1": "bbbe6ef89c12fbfb3fde78ac5c190adebbfed6ea",
-        "sha256": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg="
+      "antlr4-master-4.13.2.pom": {
+        "sha1": "c16aa4679ed71d485c700238d9b4730dd3d5e82e",
+        "sha256": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
      }
    }
  },

  {
-    "path": "org/antlr/antlr4-runtime/4.13.1",
+    "path": "org/antlr/antlr4-runtime/4.13.2",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "antlr4-runtime-4.13.1.pom": {
-        "sha1": "4ca08d3d1a1f5cb989858cde922f40acf129e9ac",
-        "sha256": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE="
+      "antlr4-runtime-4.13.2.pom": {
+        "sha1": "d07a9559966ddaa848df4dd2099f15ceaab173ca",
+        "sha256": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
      },
-      "antlr4-runtime-4.13.1.jar": {
-        "sha1": "17125bae1d965624e265ef49552f6465a2bfa307",
-        "sha256": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU="
+      "antlr4-runtime-4.13.2.jar": {
+        "sha1": "fc3db6d844df652a3d5db31c87fa12757f13691d",
+        "sha256": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc="
      }
    }
  },
@@ -15529,6 +15529,17 @@
    }
  },

+  {
+    "path": "org/apache/apache/33",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "apache-33.pom": {
+        "sha1": "f7b7b5a9e84395f17d7e6a136e5bfc4b9973566d",
+        "sha256": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+      }
+    }
+  },
+
  {
    "path": "org/apache/commons/commons-compress/1.8.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -15773,6 +15784,17 @@
    }
  },

+  {
+    "path": "org/apache/commons/commons-parent/72",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-72.pom": {
+        "sha1": "cdfbaff82e756be4cb74d3f09b8fbf8f6b06c79d",
+        "sha256": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
+      }
+    }
+  },
+
  {
    "path": "org/apache/httpcomponents/httpclient/4.1.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -16508,20 +16530,20 @@
  },

  {
-    "path": "org/checkerframework/checker-qual/3.45.0",
+    "path": "org/checkerframework/checker-qual/3.46.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "checker-qual-3.45.0.pom": {
-        "sha1": "90e7617dce895b07c6fe15397cca094f7d35a715",
-        "sha256": "sha256-6vn2Le5avMuaKZkVyz1YKpOBUAB4+FeZOO3hH3I2FXQ="
+      "checker-qual-3.46.0.pom": {
+        "sha1": "023fdbd16acb7971828aaa6938b7d2d224e188f0",
+        "sha256": "sha256-p4dUUeMHmg2EH0WWOeaRpSkx+js+dFHYjzBxbvjNiEs="
      },
-      "checker-qual-3.45.0.jar": {
-        "sha1": "f59fc9e26caad509272d2e2ffbaf275cbc0dd9eb",
-        "sha256": "sha256-MD7T1T7EEsVJyE+Iun+0Jd5RyIdspi3fVLJu7EPVtEM="
+      "checker-qual-3.46.0.jar": {
+        "sha1": "829954afc56f1737a1df3ab5aa889de574b97cc4",
+        "sha256": "sha256-S8d6FyJ5MEw/NQRda5yEkngPBH5a2ZGdd0McrynkRAE="
      },
-      "checker-qual-3.45.0.module": {
-        "sha1": "20431fb8b16c7c376df7354b4ae77c3cf36dc7c7",
-        "sha256": "sha256-vY6PlipqhNL39OPF6EnKbP+wmGggEXc2oiqLo33he+I="
+      "checker-qual-3.46.0.module": {
+        "sha1": "d3a39af168be2cc83d9023b723e56f0c51c9e066",
+        "sha256": "sha256-HrKvP0T95kPuHZ9B1Of8hTLqahFKRqgiqX9tji/UWvU="
      }
    }
  },
@@ -16857,27 +16879,27 @@
  },

  {
-    "path": "org/easymock/easymock-parent/5.3.0",
+    "path": "org/easymock/easymock-parent/5.4.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "easymock-parent-5.3.0.pom": {
-        "sha1": "cb3dbc3dde07db5aed51fe830d3286337d1617d0",
-        "sha256": "sha256-rbgEijCk2xLHbuG2xXBxah737kpHxnYzUJuFWv6IzYQ="
+      "easymock-parent-5.4.0.pom": {
+        "sha1": "ac49fe5a7d9cfec46d7386f713c5cd5c5afed89f",
+        "sha256": "sha256-sKGUgoX4OZNIqWxgWTXYJVCnVKTDNfw0SfogL74qAnI="
      }
    }
  },

  {
-    "path": "org/easymock/easymock/5.3.0",
+    "path": "org/easymock/easymock/5.4.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "easymock-5.3.0.pom": {
-        "sha1": "425f58fb29b86ca6412e9a698e9d82ef32d84c57",
-        "sha256": "sha256-7CsgHpoQXW2uXVjfJE8eDAENPUBMxP/QV7QZ75SQGoU="
+      "easymock-5.4.0.pom": {
+        "sha1": "d566a45d12ee304ab0fba3877ebd93ef64469ea8",
+        "sha256": "sha256-v/kNdi/BrWVB5jCrgeBzJPVflbd5BhE6NKpnqn2HPhk="
      },
-      "easymock-5.3.0.jar": {
-        "sha1": "7bac0b4bbd84f49f9bcd8485281b5e52da081fa4",
-        "sha256": "sha256-31WHJ9p9nYfRGXmyxMZ0gMjvti4uQOEcNScXuYF6fz8="
+      "easymock-5.4.0.jar": {
+        "sha1": "eb56bad81c203765f4a5c74aed28142fb0d79354",
+        "sha256": "sha256-SDUEf+QbVDSRB8EaGEuhIvo8P8cIQHU0ZfdCtJ5+A6M="
      }
    }
  },
@@ -17277,20 +17299,20 @@
  },

  {
-    "path": "org/hamcrest/hamcrest-core/3.0-rc1",
+    "path": "org/hamcrest/hamcrest-core/3.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "hamcrest-core-3.0-rc1.pom": {
-        "sha1": "b4531f7e332db9adf6875d6d108788b26ea94c00",
-        "sha256": "sha256-wvfzg1qjfGTIAkKZ95WkWpoVAXkaLhaxZK1T8tqh6f0="
+      "hamcrest-core-3.0.pom": {
+        "sha1": "e419abe63f1e41cb1aa41225f0bb532b2c6e6e1a",
+        "sha256": "sha256-1kyZW1baUn0+fhhmuRkNmL0QuYanfYET7EVQeZ44WqQ="
      },
-      "hamcrest-core-3.0-rc1.jar": {
-        "sha1": "1eff1caea3852bfa392af907b5ad2d08c7ce818d",
-        "sha256": "sha256-gpIUbmwtFqZy0ZvJ9WK4T6bZ9P4/mjHYKfU07fg9fbs="
+      "hamcrest-core-3.0.jar": {
+        "sha1": "254f69f4b0ca22198acfc19fcdd5f96140431c3e",
+        "sha256": "sha256-t4o6gWkvQhzAH8F97ZpF6ftvOUnHEvjsTQHaa4wGvG4="
      },
-      "hamcrest-core-3.0-rc1.module": {
-        "sha1": "9a3cf013361bcafdd05c2f17cdc2459edebd46a5",
-        "sha256": "sha256-Hwn9JWdIE/1jePtplnM8gZkuqbpyQNWEVm+Jkw1YTvU="
+      "hamcrest-core-3.0.module": {
+        "sha1": "796d1cd3d6308a0d7338827644448450dd9b12f0",
+        "sha256": "sha256-gweKVn1bT3j27cznGvQfDnRjmIELze3N/QLiRVe8mmA="
      }
    }
  },
@@ -17322,20 +17344,20 @@
  },

  {
-    "path": "org/hamcrest/hamcrest/3.0-rc1",
+    "path": "org/hamcrest/hamcrest/3.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "hamcrest-3.0-rc1.pom": {
-        "sha1": "42a2310ee499db82c55272fa2673ca420bf6bf51",
-        "sha256": "sha256-EzeZrRqcWysG8kW0swHh2DXnoEftQMt84a8hNLBblF4="
+      "hamcrest-3.0.pom": {
+        "sha1": "3c85240a040ddb51dc33d405ef0e075ec68b6796",
+        "sha256": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
      },
-      "hamcrest-3.0-rc1.jar": {
-        "sha1": "14b0b8ef4b05961db5086455c271786a3ec5c815",
-        "sha256": "sha256-T0y5BrRrhrj071Ej9+oVwjT+w+WgGWUwdhrNptOkK5k="
+      "hamcrest-3.0.jar": {
+        "sha1": "8fd9b78a8e6a6510a078a9e30e9e86a6035cfaf7",
+        "sha256": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw="
      },
-      "hamcrest-3.0-rc1.module": {
-        "sha1": "798ea5bc678a0e450346bc3688d18e998b3cce21",
-        "sha256": "sha256-hTxz0hjDvK1uEcdyDoCmWg/TCDkL0qlgIw6G3HR/Pkw="
+      "hamcrest-3.0.module": {
+        "sha1": "ac51ee99de2e24e2776e9a76e49040b570811dd9",
+        "sha256": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4="
      }
    }
  },
@@ -19078,16 +19100,16 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.20-Beta2",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.20",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-reflect-2.0.20-Beta2.pom": {
-        "sha1": "dcba731c793650645246528ced61eaefbfb3d6fb",
-        "sha256": "sha256-oeGGbrRW4hL/svh53GUKNW7oCpPqAGAdcbO2eSZh/VM="
+      "kotlin-reflect-2.0.20.pom": {
+        "sha1": "bab129c9fe9e1c24833fa9967b3adeb6f147c1cb",
+        "sha256": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s="
      },
-      "kotlin-reflect-2.0.20-Beta2.jar": {
-        "sha1": "c107aab723629eba126d73a256261bc2dd5f6f94",
-        "sha256": "sha256-+AAY6ksSfwuYtxgNP2tx/Unu/Iq43gP6gNHI1hai73g="
+      "kotlin-reflect-2.0.20.jar": {
+        "sha1": "580c610641d75b6448825cbe455a1ded220e148b",
+        "sha256": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA="
      }
    }
  },
@@ -20665,28 +20687,28 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.20-Beta2",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.20",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-stdlib-2.0.20-Beta2.pom": {
-        "sha1": "072b10781d710062d541929d810c0f5abece834f",
-        "sha256": "sha256-7nhCT2tDwl9IGhtJQUrUf4hoSbtgj+cLdu6cwKsNwRs="
+      "kotlin-stdlib-2.0.20.pom": {
+        "sha1": "1f331b5e2ac02f11de3e248564ffedf60a8452b3",
+        "sha256": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4="
      },
-      "kotlin-stdlib-2.0.20-Beta2-all.jar": {
-        "sha1": "6b7bb98078d39f9b446e76703a7a3b9ac881ab20",
-        "sha256": "sha256-c2DTXup0f8352l8CNcDXvjyUgDQ9qo3HMU10Uc2LYhM="
+      "kotlin-stdlib-2.0.20-all.jar": {
+        "sha1": "9bd1e1253e62c42a33a786a0cbe24da0050cb71c",
+        "sha256": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg="
      },
-      "kotlin-stdlib-2.0.20-Beta2-common.jar": {
-        "sha1": "e20b394b07c3e71fcd241f46159d13cb90fe79a4",
-        "sha256": "sha256-wboFR9YQ07iNrZCwIT8DUrT3w0Qpuu3llUiu0MUiVEY="
+      "kotlin-stdlib-2.0.20-common.jar": {
+        "sha1": "7484111a8b4551fbe8a50d66de8b36f0af1de252",
+        "sha256": "sha256-5U//s64omzwm42t3TCvW+LojfkiwkioTPlvHSKxPP+o="
      },
-      "kotlin-stdlib-2.0.20-Beta2.jar": {
-        "sha1": "3b5a0c1aa186088d3b4a323f22822c8fff6f73c4",
-        "sha256": "sha256-rFnFiItEt/OSYo338a26XZh/AiBxz97IgmEVolBpzYg="
+      "kotlin-stdlib-2.0.20.jar": {
+        "sha1": "7388d355f7cceb002cd387ccb7ab3850e4e0a07f",
+        "sha256": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY="
      },
-      "kotlin-stdlib-2.0.20-Beta2.module": {
-        "sha1": "2163c5eba25f097c62eddc8f6d54a37398c4f903",
-        "sha256": "sha256-BB6Jv2FfcrLP46MsolVAmCcrt2lWmpM4ycHBtkRM9LI="
+      "kotlin-stdlib-2.0.20.module": {
+        "sha1": "2d6ffff8c9388d2823dacfe0cbac843e30b077a7",
+        "sha256": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns="
      }
    }
  },
@@ -20985,16 +21007,16 @@
  },

  {
-    "path": "org/junit/junit-bom/5.11.0-M2",
+    "path": "org/junit/junit-bom/5.11.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "junit-bom-5.11.0-M2.pom": {
-        "sha1": "6c517cddae7893aba5bf9f051c44860a4fc18211",
-        "sha256": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
+      "junit-bom-5.11.0.pom": {
+        "sha1": "a4a8a67d5348d748a6345d6f1d08846fb2780ed9",
+        "sha256": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
      },
-      "junit-bom-5.11.0-M2.module": {
-        "sha1": "4546561225def9f7f99c7c1abc3828dec51aad2a",
-        "sha256": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4="
+      "junit-bom-5.11.0.module": {
+        "sha1": "d0302ab22149450fd7698262515751337f70a3a6",
+        "sha256": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0="
      }
    }
  },
@@ -21090,16 +21112,16 @@
  },

  {
-    "path": "org/mockito/mockito-core/5.12.0",
+    "path": "org/mockito/mockito-core/5.13.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "mockito-core-5.12.0.pom": {
-        "sha1": "63bde3dc82d8ee626ecf765f61a1ce7b8c68cb96",
-        "sha256": "sha256-bccvwKe1NHdVVfgzB0hiqcUwE6ZzOD4hMStYHKI7dhI="
+      "mockito-core-5.13.0.pom": {
+        "sha1": "1dea8951406bcc4570567888b064c30f821f50ef",
+        "sha256": "sha256-dFb4MOc+cmMcCbb3LQyyeCvlHI8fnGAzAtTLsrYqLVI="
      },
-      "mockito-core-5.12.0.jar": {
-        "sha1": "22f8bbaf478e6789164787fa411a3b5ed986e110",
-        "sha256": "sha256-Si6ykjcFDadJ6QpG+Ui85+JuwitnHkH1mxrG9LZAgik="
+      "mockito-core-5.13.0.jar": {
+        "sha1": "bb2ba38657ce6fa72a13d96009d0b3bb9d7ddc1e",
+        "sha256": "sha256-+Kba2VEfvICcSTsYQEFOQhcjNeQUvbq+ZD3S1T2umn4="
      }
    }
  },
@@ -496,7 +496,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
 com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
 com.fasterxml.woodstox:woodstox-core:6.2.1
-com.github.Dimezis:BlurView:version-2.0.3
+com.github.Dimezis:BlurView:version-2.0.4
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
 com.github.bumptech.glide:disklrucache:4.12.0
@@ -487,7 +487,7 @@ https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha08/core-proto-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
-https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.3/BlurView-version-2.0.3.pom
+https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.pom
@@ -509,7 +509,7 @@ https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.po
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.3/commons-logging-1.3.3.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.4/commons-logging-1.3.4.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -693,7 +693,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.29.2/error_prone_annotations-2.29.2.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.31.0/error_prone_annotations-2.31.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -706,7 +706,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.29.2/error_prone_parent-2.29.2.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.31.0/error_prone_parent-2.31.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -723,8 +723,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.1-jre/guava-parent-33.2.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.1-jre/guava-testlib-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.0-jre/guava-parent-33.3.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.0-jre/guava-testlib-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -737,7 +737,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.0-jre/guava-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -751,7 +751,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0-RC1/protobuf-bom-4.28.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0/protobuf-bom-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -768,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0-RC1/protobuf-java-4.28.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0/protobuf-java-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -779,7 +779,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0-RC1/protobuf-parent-4.28.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0/protobuf-parent-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -916,9 +916,9 @@ https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.52.Final/netty-
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/5.0.0.Alpha2/netty-resolver-5.0.0.Alpha2.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.65.Final/netty-tcnative-classes-2.0.65.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.66.Final/netty-tcnative-classes-2.0.66.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.46.Final/netty-tcnative-parent-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.65.Final/netty-tcnative-parent-2.0.65.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.66.Final/netty-tcnative-parent-2.0.66.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.34.Final/netty-transport-4.1.34.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.52.Final/netty-transport-4.1.52.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.pom
@@ -950,15 +950,15 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.15/byte-buddy-agent-1.14.15.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.0/byte-buddy-agent-1.15.0.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.15/byte-buddy-parent-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.17/byte-buddy-parent-1.14.17.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.18/byte-buddy-parent-1.14.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.0/byte-buddy-parent-1.15.0.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.15/byte-buddy-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.17/byte-buddy-1.14.17.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.18/byte-buddy-1.14.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.0/byte-buddy-1.15.0.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
@@ -982,8 +982,8 @@ https://repo.maven.apache.org/maven2/org/abego/treelayout/org.abego.treelayout.c
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.pom
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.3.4/ST4-4.3.4.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.13.1/antlr4-master-4.13.1.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.13.2/antlr4-master-4.13.2.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.13.2/antlr4-runtime-4.13.2.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.3/antlr-master-3.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.5.2/antlr-master-3.5.2.pom
@@ -1004,6 +1004,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -1024,6 +1025,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1078,7 +1080,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.45.0/checker-qual-3.45.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.46.0/checker-qual-3.46.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1101,8 +1103,8 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/84/mojo-paren
 https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.3.0/easymock-parent-5.3.0.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock/5.3.0/easymock-5.3.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.4.0/easymock-parent-5.4.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock/5.4.0/easymock-5.4.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.2/angus-activation-project-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.2/angus-activation-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-1.0.2.pom
@@ -1133,10 +1135,10 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.po
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0-rc1/hamcrest-core-3.0-rc1.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0/hamcrest-core-3.0.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0-rc1/hamcrest-3.0-rc1.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0/hamcrest-3.0.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jacoco.build-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
@@ -1236,7 +1238,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20-Beta2/kotlin-reflect-2.0.20-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20/kotlin-reflect-2.0.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1341,7 +1343,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20-Beta2/kotlin-stdlib-2.0.20-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20/kotlin-stdlib-2.0.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1361,14 +1363,14 @@ https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M2/junit-bom-5.11.0-M2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0/junit-bom-5.11.0.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.12.0/mockito-core-5.12.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.13.0/mockito-core-5.13.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
@@ -23,6 +23,7 @@
  # Android architectures to build for
  # Used to detect end-to-end builds
  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "arm64-v8a",
+  universalApk ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_universalApk" "false"
 }:

 let
@@ -89,6 +90,7 @@ in stdenv.mkDerivation rec {
  ORG_GRADLE_PROJECT_commitHash = commitHash;
  ORG_GRADLE_PROJECT_buildUrl = buildUrl;
  ORG_GRADLE_PROJECT_hermesEnabled = hermesEnabled;
+  ORG_GRADLE_PROJECT_universalApk = universalApk;

  # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
  NODE_OPTIONS = "--openssl-legacy-provider";
@@ -14,7 +14,7 @@
    "@react-native-camera-roll/camera-roll": "7.5.2",
    "@react-native-clipboard/clipboard": "1.13.2",
    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "4.4.0",
+    "@react-native-community/blur": "4.4.1",
    "@react-native-community/hooks": "^3.0.0",
    "@react-native-community/masked-view": "^0.1.6",
    "@react-native-community/netinfo": "^4.4.0",
@@ -1,7 +1,9 @@
 (ns legacy.status-im.data-store.settings
  (:require
    [clojure.set :as set]
+    [clojure.string :as string]
    [legacy.status-im.data-store.visibility-status-updates :as visibility-status-updates]
+    [status-im.contexts.wallet.common.validation :as validation]
    [utils.ethereum.eip.eip55 :as eip55]))

 (defn rpc->visible-tokens
@@ -18,6 +20,13 @@
             {}
             pinned-mailservers))

+(defn rpc->currency
+  [currency]
+  (-> currency
+      (name)
+      (string/lower-case)
+      (keyword)))
+
 (defn rpc->settings
  [settings]
  (-> settings
@@ -26,7 +35,8 @@
      (update :wallet-legacy/visible-tokens rpc->visible-tokens)
      (update :pinned-mailservers rpc->pinned-mailservers)
      (update :link-previews-enabled-sites set)
-      (update :currency keyword)
+      (update :currency rpc->currency)
+      (assoc :ens-name? (validation/ens-name? (:preferred-name settings)))
      (visibility-status-updates/<-rpc-settings)
      (set/rename-keys {:compressedKey :compressed-key
                        :emojiHash     :emoji-hash})))
@@ -34,5 +44,5 @@
 (defn rpc->setting-value
  [{:keys [name] :as setting}]
  (condp = name
-    :currency (update setting :value keyword)
+    :currency (update setting :value rpc->currency)
    setting))
@@ -85,11 +85,12 @@
 (rf/defn add-members
  "Add members to a group chat"
  {:events [:group-chats.ui/add-members-pressed]}
-  [{{:group-chat/keys [selected-participants]} :db :as cofx} chat-id]
-  {:json-rpc/call [{:method      "wakuext_addMembersToGroupChat"
-                    :params      [nil chat-id selected-participants]
-                    :js-response true
-                    :on-success  #(re-frame/dispatch [:chat-updated % true])}]})
+  [{{:group-chat/keys [selected-participants]} :db} chat-id]
+  (when (seq selected-participants)
+    {:json-rpc/call [{:method      "wakuext_addMembersToGroupChat"
+                      :params      [nil chat-id selected-participants]
+                      :js-response true
+                      :on-success  #(re-frame/dispatch [:chat-updated % true])}]}))

 (rf/defn add-members-from-invitation
  "Add members to a group chat"
@@ -1,5 +1,6 @@
 (ns legacy.status-im.multiaccounts.update.core
  (:require
+    [legacy.status-im.data-store.settings :as settings]
    [legacy.status-im.utils.deprecated-types :as types]
    [status-im.constants :as constants]
    [taoensso.timbre :as log]
@@ -81,7 +82,7 @@
  [{:keys [db] :as cofx} setting setting-value]
  (let [current-multiaccount (:profile/profile db)
        setting-value        (if (= :currency setting)
-                               (keyword setting-value)
+                               (settings/rpc->currency setting-value)
                               setting-value)
        db                   (case setting
                               :stickers/packs-pending
@@ -104,7 +105,9 @@
                               db)]
    {:db (if setting-value
           (assoc-in db [:profile/profile setting] setting-value)
-           (update db :profile/profile dissoc setting))}))
+           (update db :profile/profile dissoc setting))
+     :fx [(when (= setting :currency)
+            [:dispatch [:wallet/get-wallet-token-for-all-accounts]])]}))

 (rf/defn set-many-js
  [cofx settings-js]
@@ -1,84 +0,0 @@
-(ns legacy.status-im.utils.currency
-  (:require
-    [utils.i18n :as i18n]))
-
-(def currencies
-  {:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"}
-   :afn {:id :afn :code "AFN" :display-name (i18n/label :t/currency-display-name-afn) :symbol "؋"}
-   :ars {:id :ars :code "ARS" :display-name (i18n/label :t/currency-display-name-ars) :symbol "$"}
-   :aud {:id :aud :code "AUD" :display-name (i18n/label :t/currency-display-name-aud) :symbol "$"}
-   :bbd {:id :bbd :code "BBD" :display-name (i18n/label :t/currency-display-name-bbd) :symbol "$"}
-   :bdt {:id :bdt :code "BDT" :display-name (i18n/label :t/currency-display-name-bdt) :symbol " Tk"}
-   :bgn {:id :bgn :code "BGN" :display-name (i18n/label :t/currency-display-name-bgn) :symbol "лв"}
-   :bhd {:id :bhd :code "BHD" :display-name (i18n/label :t/currency-display-name-bhd) :symbol "BD"}
-   :bnd {:id :bnd :code "BND" :display-name (i18n/label :t/currency-display-name-bnd) :symbol "$"}
-   :bob {:id :bob :code "BOB" :display-name (i18n/label :t/currency-display-name-bob) :symbol "$b"}
-   :brl {:id :brl :code "BRL" :display-name (i18n/label :t/currency-display-name-brl) :symbol "R$"}
-   :btn {:id :btn :code "BTN" :display-name (i18n/label :t/currency-display-name-btn) :symbol "Nu."}
-   :cad {:id :cad :code "CAD" :display-name (i18n/label :t/currency-display-name-cad) :symbol "$"}
-   :chf {:id :chf :code "CHF" :display-name (i18n/label :t/currency-display-name-chf) :symbol "CHF"}
-   :clp {:id :clp :code "CLP" :display-name (i18n/label :t/currency-display-name-clp) :symbol "$"}
-   :cny {:id :cny :code "CNY" :display-name (i18n/label :t/currency-display-name-cny) :symbol "¥"}
-   :cop {:id :cop :code "COP" :display-name (i18n/label :t/currency-display-name-cop) :symbol "$"}
-   :crc {:id :crc :code "CRC" :display-name (i18n/label :t/currency-display-name-crc) :symbol "₡"}
-   :czk {:id :czk :code "CZK" :display-name (i18n/label :t/currency-display-name-czk) :symbol "Kč"}
-   :dkk {:id :dkk :code "DKK" :display-name (i18n/label :t/currency-display-name-dkk) :symbol "kr"}
-   :dop {:id :dop :code "DOP" :display-name (i18n/label :t/currency-display-name-dop) :symbol "RD$"}
-   :egp {:id :egp :code "EGP" :display-name (i18n/label :t/currency-display-name-egp) :symbol "£"}
-   :etb {:id :etb :code "ETB" :display-name (i18n/label :t/currency-display-name-etb) :symbol "Br"}
-   :eur {:id :eur :code "EUR" :display-name (i18n/label :t/currency-display-name-eur) :symbol "€"}
-   :gbp {:id :gbp :code "GBP" :display-name (i18n/label :t/currency-display-name-gbp) :symbol "£"}
-   :gel {:id :gel :code "GEL" :display-name (i18n/label :t/currency-display-name-gel) :symbol "₾"}
-   :ghs {:id :ghs :code "GHS" :display-name (i18n/label :t/currency-display-name-ghs) :symbol "¢"}
-   :hkd {:id :hkd :code "HKD" :display-name (i18n/label :t/currency-display-name-hkd) :symbol "$"}
-   :hrk {:id :hrk :code "HRK" :display-name (i18n/label :t/currency-display-name-hrk) :symbol "kn"}
-   :huf {:id :huf :code "HUF" :display-name (i18n/label :t/currency-display-name-huf) :symbol "Ft"}
-   :idr {:id :idr :code "IDR" :display-name (i18n/label :t/currency-display-name-idr) :symbol "Rp"}
-   :ils {:id :ils :code "ILS" :display-name (i18n/label :t/currency-display-name-ils) :symbol "₪"}
-   :inr {:id :inr :code "INR" :display-name (i18n/label :t/currency-display-name-inr) :symbol "₹"}
-   :isk {:id :isk :code "ISK" :display-name (i18n/label :t/currency-display-name-isk) :symbol "kr"}
-   :jmd {:id :jmd :code "JMD" :display-name (i18n/label :t/currency-display-name-jmd) :symbol "J$"}
-   :jpy {:id :jpy :code "JPY" :display-name (i18n/label :t/currency-display-name-jpy) :symbol "¥"}
-   :kes {:id :kes :code "KES" :display-name (i18n/label :t/currency-display-name-kes) :symbol "KSh"}
-   :krw {:id :krw :code "KRW" :display-name (i18n/label :t/currency-display-name-krw) :symbol "₩"}
-   :kwd {:id :kwd :code "KWD" :display-name (i18n/label :t/currency-display-name-kwd) :symbol "د.ك"}
-   :kzt {:id :kzt :code "KZT" :display-name (i18n/label :t/currency-display-name-kzt) :symbol "лв"}
-   :lkr {:id :lkr :code "LKR" :display-name (i18n/label :t/currency-display-name-lkr) :symbol "₨"}
-   :mad {:id :mad :code "MAD" :display-name (i18n/label :t/currency-display-name-mad) :symbol "MAD"}
-   :mdl {:id :mdl :code "MDL" :display-name (i18n/label :t/currency-display-name-mdl) :symbol "MDL"}
-   :mur {:id :mur :code "MUR" :display-name (i18n/label :t/currency-display-name-mur) :symbol "₨"}
-   :mwk {:id :mwk :code "MWK" :display-name (i18n/label :t/currency-display-name-mwk) :symbol "MK"}
-   :mxn {:id :mxn :code "MXN" :display-name (i18n/label :t/currency-display-name-mxn) :symbol "$"}
-   :myr {:id :myr :code "MYR" :display-name (i18n/label :t/currency-display-name-myr) :symbol "RM"}
-   :mzn {:id :mzn :code "MZN" :display-name (i18n/label :t/currency-display-name-mzn) :symbol "MT"}
-   :nad {:id :nad :code "NAD" :display-name (i18n/label :t/currency-display-name-nad) :symbol "$"}
-   :ngn {:id :ngn :code "NGN" :display-name (i18n/label :t/currency-display-name-ngn) :symbol "₦"}
-   :nok {:id :nok :code "NOK" :display-name (i18n/label :t/currency-display-name-nok) :symbol "kr"}
-   :npr {:id :npr :code "NPR" :display-name (i18n/label :t/currency-display-name-npr) :symbol "₨"}
-   :nzd {:id :nzd :code "NZD" :display-name (i18n/label :t/currency-display-name-nzd) :symbol "$"}
-   :omr {:id :omr :code "OMR" :display-name (i18n/label :t/currency-display-name-omr) :symbol "﷼"}
-   :pen {:id :pen :code "PEN" :display-name (i18n/label :t/currency-display-name-pen) :symbol "S/."}
-   :pgk {:id :pgk :code "PGK" :display-name (i18n/label :t/currency-display-name-pgk) :symbol "K"}
-   :php {:id :php :code "PHP" :display-name (i18n/label :t/currency-display-name-php) :symbol "₱"}
-   :pkr {:id :pkr :code "PKR" :display-name (i18n/label :t/currency-display-name-pkr) :symbol "₨"}
-   :pln {:id :pln :code "PLN" :display-name (i18n/label :t/currency-display-name-pln) :symbol "zł"}
-   :pyg {:id :pyg :code "PYG" :display-name (i18n/label :t/currency-display-name-pyg) :symbol "Gs"}
-   :qar {:id :qar :code "QAR" :display-name (i18n/label :t/currency-display-name-qar) :symbol "﷼"}
-   :ron {:id :ron :code "RON" :display-name (i18n/label :t/currency-display-name-ron) :symbol "lei"}
-   :rsd {:id :rsd :code "RSD" :display-name (i18n/label :t/currency-display-name-rsd) :symbol "Дин."}
-   :rub {:id :rub :code "RUB" :display-name (i18n/label :t/currency-display-name-rub) :symbol "₽"}
-   :sar {:id :sar :code "SAR" :display-name (i18n/label :t/currency-display-name-sar) :symbol "﷼"}
-   :sek {:id :sek :code "SEK" :display-name (i18n/label :t/currency-display-name-sek) :symbol "kr"}
-   :sgd {:id :sgd :code "SGD" :display-name (i18n/label :t/currency-display-name-sgd) :symbol "$"}
-   :thb {:id :thb :code "THB" :display-name (i18n/label :t/currency-display-name-thb) :symbol "฿"}
-   :ttd {:id :ttd :code "TTD" :display-name (i18n/label :t/currency-display-name-ttd) :symbol "TT$"}
-   :twd {:id :twd :code "TWD" :display-name (i18n/label :t/currency-display-name-twd) :symbol "NT$"}
-   :tzs {:id :tzs :code "TZS" :display-name (i18n/label :t/currency-display-name-tzs) :symbol "TSh"}
-   :try {:id :try :code "TRY" :display-name (i18n/label :t/currency-display-name-try) :symbol "₺"}
-   :uah {:id :uah :code "UAH" :display-name (i18n/label :t/currency-display-name-uah) :symbol "₴"}
-   :ugx {:id :ugx :code "UGX" :display-name (i18n/label :t/currency-display-name-ugx) :symbol "USh"}
-   :uyu {:id :uyu :code "UYU" :display-name (i18n/label :t/currency-display-name-uyu) :symbol "$U"}
-   :usd {:id :usd :code "USD" :display-name (i18n/label :t/currency-display-name-usd) :symbol "$"}
-   :vef {:id :vef :code "VEF" :display-name (i18n/label :t/currency-display-name-vef) :symbol "Bs"}
-   :vnd {:id :vnd :code "VND" :display-name (i18n/label :t/currency-display-name-vnd) :symbol "₫"}
-   :zar {:id :zar :code "ZAR" :display-name (i18n/label :t/currency-display-name-zar) :symbol "R"}})
@@ -7,6 +7,7 @@
     [:map {:closed true}
      [:action? {:optional true} [:maybe boolean?]]
      [:text {:optional true} [:maybe string?]]
+      [:container-style {:optional true} [:maybe :map]]
      [:button-text {:optional true} [:maybe string?]]
      [:on-button-press {:optional true} [:maybe fn?]]]]]
   :any])
@@ -1,12 +1,15 @@
 (ns quo.components.banners.alert-banner.style
  (:require [quo.foundations.colors :as colors]))

-(def container
-  {:flex-direction     :row
-   :align-items        :center
-   :height             50
-   :padding-horizontal 20
-   :padding-vertical   12})
+(defn container
+  [container-style]
+  (merge
+   {:flex-direction     :row
+    :align-items        :center
+    :height             50
+    :padding-horizontal 20
+    :padding-vertical   12}
+   container-style))

 (defn label
  [theme]
@@ -11,12 +11,12 @@
            [schema.core :as schema]))

 (defn- view-internal
-  [{:keys [action? text button-text on-button-press]}]
+  [{:keys [action? text button-text container-style on-button-press]}]
  (let [theme (quo.theme/use-theme)]
    [rn/view
     {:accessibility-label :alert-banner}
     [linear-gradient/linear-gradient
-      {:style  style/container
+      {:style  (style/container container-style)
       :start  {:x 0 :y 0}
       :end    {:x 0 :y 1}
       :colors [(colors/theme-colors
@@ -4,7 +4,7 @@
    [quo.components.calendar.calendar.view :as calendar]
    [test-helpers.component :as h]))

-(def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 5))
+(def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 8))
 (def end-date (time/date-time (time/plus start-date (time/days 2))))

 (h/describe "calendar component"
@@ -23,7 +23,7 @@
        {:start-date nil
         :end-date   nil
         :on-change  on-change}])
-      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
      (h/was-called-with on-change {:start-date start-date :end-date nil})))

  (h/test "should call on-change with start and end date on second click"
@@ -31,7 +31,7 @@
      (h/render
       [calendar/view
        {:start-date start-date :end-date nil :on-change on-change}])
-      (h/fire-event :press (h/query-by-text (str (time/day end-date))))
+      (h/fire-event :press (h/query-first-by-text (str (time/day end-date))))
      (h/was-called-with on-change {:start-date start-date :end-date end-date})))

  (h/test "should reset the dates on third click"
@@ -41,7 +41,7 @@
        {:start-date start-date
         :end-date   end-date
         :on-change  on-change}])
-      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
      (h/was-called-with on-change {:start-date start-date :end-date nil})))

  (h/test "should reset dates when start date is clicked again"
@@ -51,7 +51,7 @@
        {:start-date start-date
         :end-date   nil
         :on-change  on-change}])
-      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
      (h/was-called-with on-change {:start-date nil :end-date nil})))

  (h/test "should assign start and end date correctly when upper range selected first"
@@ -61,5 +61,5 @@
        {:start-date end-date
         :end-date   nil
         :on-change  on-change}])
-      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
      (h/was-called-with on-change {:start-date start-date :end-date end-date}))))
@@ -91,7 +91,7 @@
     :color-index     gradient-color-index}]])

 (defn- card-details
-  [{:keys [community? avatar-image-src collectible-name theme state set-state]}]
+  [{:keys [community? avatar-image-src collectible-name theme state set-state loading?]}]
  (let [loader-opacity            (reanimated/use-shared-value 1)
        avatar-opacity            (reanimated/use-shared-value 0)
        [load-time set-load-time] (rn/use-state (datetime/now))
@@ -102,7 +102,7 @@
                                                     :avatar-opacity avatar-opacity}))
        empty-name?               (string/blank? collectible-name)]
    (rn/use-mount (fn []
-                    (when (string/blank? avatar-image-src)
+                    (when (and (string/blank? avatar-image-src) (not loading?))
                      (set-avatar-loaded))))
    [rn/view {:style style/card-details-container}
     [reanimated/view {:style (style/avatar-container avatar-opacity)}
@@ -137,7 +137,7 @@

 (defn- card-view
  [{:keys [avatar-image-src collectible-name community? counter state set-state
-           gradient-color-index image-src supported-file?]}]
+           gradient-color-index image-src supported-file? loading?]}]
  (let [theme                     (quo.theme/use-theme)
        loader-opacity            (reanimated/use-shared-value (if supported-file? 1 0))
        image-opacity             (reanimated/use-shared-value (if supported-file? 0 1))
@@ -189,6 +189,7 @@
       :community?       community?
       :avatar-image-src avatar-image-src
       :collectible-name collectible-name
+       :loading?         loading?
       :theme            theme}]]))

 (defn- image-view
@@ -276,6 +277,7 @@
      [:supported-file? {:optional true} [:maybe boolean?]]
      [:native-ID {:optional true} [:maybe [:or string? keyword?]]]
      [:community? {:optional true} [:maybe boolean?]]
+      [:loading? {:optional true} [:maybe boolean?]]
      [:counter {:optional true} [:maybe [:or :string :int]]]
      [:gradient-color-index {:optional true}
       [:maybe [:enum :gradient-1 :gradient-2 :gradient-3 :gradient-4 :gradient-5]]]
@@ -126,7 +126,7 @@
      [:subtitle-type {:optional true} [:maybe [:enum :default :icon :network :account :editable]]]
      [:size {:optional true} [:maybe [:enum :default :small :large]]]
      [:title :string]
-      [:subtitle {:optional true} [:maybe :string]]
+      [:subtitle {:optional true} [:maybe [:or :string :double]]]
      [:custom-subtitle {:optional true} [:maybe fn?]]
      [:icon {:optional true} [:maybe :keyword]]
      [:emoji {:optional true} [:maybe :string]]
@@ -10,6 +10,7 @@
    [quo.components.settings.settings-item.style :as style]
    [quo.components.tags.context-tag.view :as context-tag]
    [quo.components.tags.status-tags :as status-tags]
+    [quo.components.utilities.token.view :as token]
    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
@@ -59,6 +60,7 @@
       :icon        [icon/icon image-props (style/color blur? theme)]
       :avatar      [user-avatar/user-avatar image-props]
       :icon-avatar [icon-avatar/icon-avatar image-props]
+       :token       [token/view image-props]
       nil)]))

 (defn tag-component
@@ -60,8 +60,12 @@
    shrinkable? (assoc :flex-shrink 1)))

 (defn text
-  [theme]
-  {:color (colors/theme-colors colors/neutral-100 colors/white theme)})
+  ([theme]
+   (text theme false))
+  ([theme gray-text?]
+   {:color (if gray-text?
+             colors/neutral-50
+             (colors/theme-colors colors/neutral-100 colors/white theme))}))

 (defn token-logo
  [size]
@@ -1,5 +1,6 @@
 (ns quo.components.tags.context-tag.view
  (:require
+    [clojure.string :as string]
    [quo.components.avatars.account-avatar.view :as account-avatar]
    [quo.components.avatars.group-avatar.view :as group-avatar]
    [quo.components.avatars.user-avatar.view :as user-avatar]
@@ -17,15 +18,16 @@
    [schema.core :as schema]))

 (defn- tag-skeleton
-  [{:keys [size text theme shrinkable?]
-    :or   {size  24
-           theme (quo.theme/use-theme)}}
+  [{:keys [size text theme shrinkable? gray-text?]
+    :or   {size       24
+           gray-text? false
+           theme      (quo.theme/use-theme)}}
   logo-component]
  [rn/view {:style (style/tag-container size)}
   logo-component
   [rn/view {:style (style/tag-spacing size shrinkable?)}
    [text/text
-     {:style           (style/text theme)
+     {:style           (style/text theme gray-text?)
      :weight          :medium
      :size            (if (= size 24) :paragraph-2 :paragraph-1)
      :number-of-lines 1
@@ -94,92 +96,107 @@
           state               :default
           theme               (quo.theme/use-theme)}
    :as   props}]
-  [rn/view {:style (merge {:align-items :flex-start} container-style)}
-   [rn/view
-    {:style               (style/container {:theme               theme
-                                            :type                type
-                                            :size                size
-                                            :state               state
-                                            :blur?               blur?
-                                            :customization-color customization-color})
-     :accessibility-label :context-tag}
-    (case type
-      :default
-      [tag-skeleton {:theme theme :size size :text full-name}
-       [user-avatar/user-avatar
-        {:full-name           full-name
-         :profile-picture     profile-picture
-         :size                (if (= size 24) :xxs 28)
-         :status-indicator?   false
-         :ring?               false
-         :customization-color customization-color}]]
+  (let [[image-error? set-image-error] (rn/use-state false)]
+    [rn/view {:style (merge {:align-items :flex-start} container-style)}
+     [rn/view
+      {:style               (style/container {:theme               theme
+                                              :type                type
+                                              :size                size
+                                              :state               state
+                                              :blur?               blur?
+                                              :customization-color customization-color})
+       :accessibility-label :context-tag}
+      (case type
+        :default
+        [tag-skeleton {:theme theme :size size :text full-name}
+         [user-avatar/user-avatar
+          {:full-name           full-name
+           :profile-picture     profile-picture
+           :size                (if (= size 24) :xxs 28)
+           :status-indicator?   false
+           :ring?               false
+           :customization-color customization-color}]]

-      :multiuser
-      [preview-list/view {:type :user :size :size-20}
-       users]
+        :multiuser
+        [preview-list/view {:type :user :size :size-20}
+         users]

-      :multinetwork
-      [preview-list/view {:type :network :size :size-20}
-       networks]
+        :multinetwork
+        [preview-list/view {:type :network :size :size-20}
+         networks]

-      :audio
-      [tag-skeleton {:theme theme :text (str duration)}
-       [rn/view {:style (style/audio-tag-icon-container customization-color theme)}
-        [icons/icon :i/play {:color style/audio-tag-icon-color :size 12}]]]
+        :audio
+        [tag-skeleton {:theme theme :text (str duration)}
+         [rn/view {:style (style/audio-tag-icon-container customization-color theme)}
+          [icons/icon :i/play {:color style/audio-tag-icon-color :size 12}]]]

-      :group
-      [tag-skeleton {:theme theme :size size :text group-name}
-       [group-avatar/view
-        {:icon-name           :i/members
-         :size                (if (= size 24) :size-20 :size-28)
-         :customization-color (colors/custom-color customization-color 50)}]]
+        :group
+        [tag-skeleton {:theme theme :size size :text group-name}
+         [group-avatar/view
+          {:icon-name           :i/members
+           :size                (if (= size 24) :size-20 :size-28)
+           :customization-color (colors/custom-color customization-color 50)}]]

-      (:channel :community)
-      [communities-tag (assoc props :channel? (= type :channel))]
+        (:channel :community)
+        [communities-tag (assoc props :channel? (= type :channel))]

-      :token
-      [tag-skeleton {:theme theme :size size :text (str amount " " token)}
-       [token/view
-        {:style (style/token-logo size)
-         :token token
-         :size  (if (= size 24) :size-20 :size-28)}]]
+        :token
+        [tag-skeleton {:theme theme :size size :text (str amount " " token)}
+         [token/view
+          {:style (style/token-logo size)
+           :token token
+           :size  (if (= size 24) :size-20 :size-28)}]]

-      :network
-      [tag-skeleton {:theme theme :size size :text network-name}
-       [rn/image {:style (style/circle-logo size) :source network-logo}]]
+        :network
+        [tag-skeleton {:theme theme :size size :text network-name}
+         [rn/image {:style (style/circle-logo size) :source network-logo}]]

-      :collectible
-      [tag-skeleton
-       {:theme       theme
-        :size        size
-        :text        (str collectible-name " #" collectible-number)
-        :shrinkable? true}
-       [rn/image {:style (style/rounded-logo size) :source collectible}]]
+        :collectible
+        (let [gray-text?       (string/blank? collectible-name)
+              collectible-text (cond
+                                 gray-text?         "UNKNOWN"
+                                 collectible-number (str collectible-name
+                                                         " #"
+                                                         collectible-number)
+                                 :else              collectible-name)
+              nft-placeholder? (or image-error? (string/blank? collectible))]
+          [tag-skeleton
+           {:theme       theme
+            :size        size
+            :text        collectible-text
+            :shrinkable? true
+            :gray-text?  gray-text?}
+           (if nft-placeholder?
+             [icons/icon :i/nft {:size 20}]
+             [rn/image
+              {:style    (style/rounded-logo size)
+               :source   collectible
+               :on-error #(set-image-error true)}])])

-      :account
-      [tag-skeleton {:theme theme :size size :text account-name}
-       [account-avatar/view
-        {:customization-color customization-color
-         :emoji               emoji
-         :size                (if (= size 24) 20 28)}]]
+        :account
+        [tag-skeleton {:theme theme :size size :text account-name}
+         [account-avatar/view
+          {:customization-color customization-color
+           :emoji               emoji
+           :size                (if (= size 24) 20 28)}]]

-      :address
-      [address-tag props]
+        :address
+        [address-tag props]

-      :icon
-      [icon-tag props]
+        :icon
+        [icon-tag props]

-      :wallet-user
-      [tag-skeleton {:theme theme :size size :text full-name}
-       [wallet-user-avatar/wallet-user-avatar
-        {:full-name           full-name
-         :size                (if (= size 24) :size-20 :size-24)
-         :customization-color customization-color}]]
+        :wallet-user
+        [tag-skeleton {:theme theme :size size :text full-name}
+         [wallet-user-avatar/wallet-user-avatar
+          {:full-name           full-name
+           :size                (if (= size 24) :size-20 :size-24)
+           :customization-color customization-color}]]

-      :dapp
-      [tag-skeleton {:theme theme :size size :text dapp-name}
-       [rn/image {:style (style/circle-logo size) :source dapp-logo}]]
+        :dapp
+        [tag-skeleton {:theme theme :size size :text dapp-name}
+         [rn/image {:style (style/circle-logo size) :source dapp-logo}]]

-      nil)]])
+        nil)]]))

 (def view (schema/instrument #'view-internal component-schema/?schema))
@@ -9,6 +9,7 @@
      [:token-value :string]
      [:token-symbol :string]
      [:container-style {:optional true} [:maybe :map]]
+      [:show-view-button? {:optional true} [:maybe :boolean]]
      [:button-props {:optional true} [:maybe :map]]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]]]]
   :any])
@@ -24,7 +24,7 @@

 (defn- view-internal
  [{:keys [status token-value token-symbol
-           container-style button-props]
+           container-style button-props show-view-button?]
    :as   props}]
  (let [theme                                 (quo.theme/use-theme)
        customization-color                   (or (:customization-color props) :blue)
@@ -56,7 +56,9 @@
        (i18n/label (status-message status)
                    {:amount token-value
                     :symbol token-symbol})]]
-      (when button-props
+      (when (and button-props
+                 (or (= status :approve)
+                     (and (not= status :approve) show-view-button?)))
        [button/button
         (merge {:type                (if (= status :approve) :primary :grey)
                 :background          (when-not (= status :approve) :blur)
@@ -1,5 +1,6 @@
 (ns quo.components.wallet.swap-input.style
  (:require [quo.foundations.colors :as colors]
+            [quo.foundations.shadows :as shadows]
            [quo.foundations.typography :as typography]))

 (defn- border-color
@@ -11,11 +12,13 @@
  (colors/theme-colors colors/neutral-5 colors/neutral-90 theme))

 (defn content
-  [theme]
-  {:border-width     1
-   :border-radius    16
-   :border-color     (border-color theme)
-   :background-color (colors/theme-colors colors/white colors/neutral-95 theme)})
+  [typing? theme]
+  (merge
+   {:border-width     1
+    :border-radius    16
+    :border-color     (border-color theme)
+    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)}
+   (when typing? (shadows/get 1 theme))))

 (defn row-1
  [loading?]
@@ -19,13 +19,15 @@
    [:props
     [:map {:closed true}
      [:type {:optional true} [:maybe [:enum :pay :receive]]]
-      [:status {:optional true} [:maybe [:enum :default :disabled :loading]]]
+      [:status {:optional true} [:maybe [:enum :default :typing :disabled :loading]]]
      [:token {:optional true} [:maybe :string]]
      [:value {:optional true} [:maybe :string]]
      [:default-value {:optional true} [:maybe :string]]
      [:currency-symbol {:optional true} [:maybe :string]]
      [:fiat-value {:optional true} [:maybe :string]]
      [:show-approval-label? {:optional true} [:maybe :boolean]]
+      [:auto-focus? {:optional true} [:maybe :boolean]]
+      [:input-disabled? {:optional true} [:maybe :boolean]]
      [:error? {:optional true} [:maybe :boolean]]
      [:show-keyboard? {:optional true} [:maybe :boolean]]
      [:approval-label-props {:optional true} [:maybe approval-label.schema/?schema]]
@@ -33,6 +35,7 @@
      [:on-change-text {:optional true} [:maybe fn?]]
      [:enable-swap? {:optional true} [:maybe :boolean]]
      [:on-swap-press {:optional true} [:maybe fn?]]
+      [:on-input-focus {:optional true} [:maybe fn?]]
      [:on-token-press {:optional true} [:maybe fn?]]
      [:on-max-press {:optional true} [:maybe fn?]]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
@@ -41,13 +44,14 @@

 (defn view-internal
  [{:keys [type status token value fiat-value show-approval-label? error? network-tag-props
-           approval-label-props default-value enable-swap?
+           approval-label-props default-value auto-focus? input-disabled? enable-swap?
           currency-symbol on-change-text show-keyboard?
-           container-style on-swap-press on-token-press on-max-press]}]
+           container-style on-swap-press on-token-press on-max-press on-input-focus]}]
  (let [theme             (quo.theme/use-theme)
        pay?              (= type :pay)
        disabled?         (= status :disabled)
        loading?          (= status :loading)
+        typing?           (= status :typing)
        controlled-input? (some? value)
        input-ref         (rn/use-ref-atom nil)
        set-input-ref     (rn/use-callback (fn [ref] (reset! input-ref ref)) [])
@@ -58,7 +62,7 @@
    [rn/view
     {:style               container-style
      :accessibility-label :swap-input}
-     [rn/view {:style (style/content theme)}
+     [rn/view {:style (style/content typing? theme)}
      [rn/view
       {:style (style/row-1 loading?)}
       [rn/pressable {:on-press on-token-press}
@@ -78,7 +82,9 @@
                                                                    colors/neutral-50
                                                                    theme)
                     :keyboard-type            :numeric
-                     :auto-focus               true
+                     :editable                 (not input-disabled?)
+                     :auto-focus               auto-focus?
+                     :on-focus                 on-input-focus
                     :on-change-text           on-change-text
                     :show-soft-input-on-focus show-keyboard?
                     :default-value            default-value
@@ -6,16 +6,20 @@
 (h/describe "Wallet: Token Input"
  (h/test "Token label renders"
    (h/render-with-theme-provider [token-input/view
-                                   {:token           :snt
-                                    :currency        :eur
-                                    :currency-symbol "€"
-                                    :conversion      1}])
+                                   {:token-symbol    :snt
+                                    :currency-symbol :snt
+                                    :on-swap         nil
+                                    :error?          false
+                                    :value           "1"
+                                    :converted-value "10"}])
    (h/is-truthy (h/get-by-text "SNT")))

  (h/test "Amount renders"
    (h/render-with-theme-provider [token-input/view
-                                   {:token           :snt
-                                    :currency        :eur
-                                    :currency-symbol "€"
-                                    :conversion      1}])
+                                   {:token-symbol    :snt
+                                    :currency-symbol :snt
+                                    :on-swap         nil
+                                    :error?          false
+                                    :value           "1"
+                                    :converted-value "€0.00"}])
    (h/is-truthy (h/get-by-text "€0.00"))))
@@ -4,15 +4,14 @@
  [:=>
   [:catn
    [:props
-     [:map
-      [:token {:optional true} [:maybe [:or :string :keyword]]]
-      [:currency {:optional true} [:maybe [:or :string :keyword]]]
-      [:error? {:optional true} [:maybe :boolean]]
-      [:title {:optional true} [:maybe :string]]
-      [:conversion {:optional true} [:maybe :double]]
-      [:show-keyboard? {:optional true} [:maybe :boolean]]
-      [:networks {:optional true}
-       [:maybe [:sequential [:map [:source [:maybe :schema.common/image-source]]]]]]
-      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:value {:optional true} [:maybe :string]]]]]
+     [:map {:closed true}
+      [:token-symbol [:maybe [:or :string :keyword]]]
+      [:currency-symbol [:maybe [:or :string :keyword]]]
+      [:hint-component {:optional true} [:maybe :schema.common/hiccup]]
+      [:on-token-press {:optional true} [:maybe fn?]]
+      [:on-swap [:maybe fn?]]
+      [:container-style {:optional true} [:maybe :map]]
+      [:error? [:maybe :boolean]]
+      [:value [:maybe :string]]
+      [:converted-value [:maybe :string]]]]]
   :any])
@@ -25,9 +25,11 @@

 (defn input-container
  [window-width]
-  {:width        (- window-width 120)
-   :margin-left  8
-   :margin-right 8})
+  {:width          (- window-width 120)
+   :margin-left    8
+   :margin-right   8
+   :flex-direction :row
+   :align-items    :flex-end})

 (def text-input-dimensions
  (-> typography/heading-1
@@ -65,6 +67,6 @@
   :justify-content    :space-between
   :align-items        :center})

-(defn fiat-amount
+(defn converted-amount
  [theme]
  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
@@ -1,57 +1,15 @@
 (ns quo.components.wallet.token-input.view
  (:require
    [clojure.string :as string]
-    [oops.core :as oops]
    [quo.components.buttons.button.view :as button]
    [quo.components.dividers.divider-line.view :as divider-line]
    [quo.components.markdown.text :as text]
-    [quo.components.tags.network-tags.view :as network-tag]
    [quo.components.utilities.token.view :as token]
    [quo.components.wallet.token-input.schema :as component-schema]
    [quo.components.wallet.token-input.style :as style]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
-    [schema.core :as schema]
-    [utils.number :as number]))
-
-(defn fiat-format
-  [currency-symbol num-value conversion]
-  (str currency-symbol (.toFixed (* num-value conversion) 2)))
-
-(defn crypto-format
-  [num-value conversion crypto-decimals token]
-  (str (number/remove-trailing-zeroes
-        (.toFixed (/ num-value conversion) (or crypto-decimals 2)))
-       " "
-       (string/upper-case (or (clj->js token) ""))))
-
-(defn calc-value
-  [{:keys [crypto? currency-symbol token value conversion crypto-decimals]}]
-  (let [num-value (if (string? value)
-                    (or (parse-double value) 0)
-                    value)]
-    (if crypto?
-      (fiat-format currency-symbol num-value conversion)
-      (crypto-format num-value conversion crypto-decimals token))))
-
-(defn- data-info
-  [{:keys [theme token crypto-decimals conversion networks title crypto? currency-symbol amount
-           error?]}]
-  [rn/view {:style style/data-container}
-   [network-tag/view
-    {:networks networks
-     :title    title
-     :status   (when error? :error)}]
-   [text/text
-    {:size   :paragraph-2
-     :weight :medium
-     :style  (style/fiat-amount theme)}
-    (calc-value {:crypto?         crypto?
-                 :currency-symbol currency-symbol
-                 :token           token
-                 :value           amount
-                 :conversion      conversion
-                 :crypto-decimals crypto-decimals})]])
+    [schema.core :as schema]))

 (defn- token-name-text
  [theme text]
@@ -62,91 +20,63 @@
   (string/upper-case (or (clj->js text) ""))])

 (defn input-section
-  [{:keys [on-change-text value value-internal set-value-internal on-selection-change
-           on-token-press]}]
-  (let [input-ref               (atom nil)
-        set-ref                 #(reset! input-ref %)
-        focus-input             #(when-let [ref ^js @input-ref]
-                                   (.focus ref))
-        controlled-input?       (some? value)
-        handle-on-change-text   (fn [v]
-                                  (when-not controlled-input?
-                                    (set-value-internal v))
-                                  (when on-change-text
-                                    (on-change-text v)))
-        handle-selection-change (fn [^js e]
-                                  (when on-selection-change
-                                    (-> e
-                                        (oops/oget "nativeEvent.selection")
-                                        (js->clj :keywordize-keys true)
-                                        (on-selection-change))))]
-    (fn [{:keys [token customization-color show-keyboard? crypto? currency value error? selection
-                 handle-on-swap allow-selection?]
-          :or   {show-keyboard?   true
-                 allow-selection? true}}]
-      (let [theme        (quo.theme/use-theme)
-            window-width (:width (rn/get-window))]
-        [rn/pressable
-         {:style    {:width          "100%"
-                     :flex-direction :row}
-          :on-press on-token-press}
-         [token/view
-          {:token token
-           :size  :size-32}]
-         [rn/view {:style (style/input-container window-width)}
-          [rn/pressable
-           {:style    style/text-input-container
-            :on-press focus-input}
-           [rn/text-input
-            (cond-> {:style                    (style/text-input theme error?)
-                     :placeholder-text-color   (style/placeholder-text theme)
-                     :auto-focus               true
-                     :ref                      set-ref
-                     :placeholder              "0"
-                     :keyboard-type            :numeric
-                     :on-change-text           handle-on-change-text
-                     :selection-color          customization-color
-                     :show-soft-input-on-focus show-keyboard?
-                     :on-selection-change      handle-selection-change
-                     :selection                (clj->js selection)
-                     :editable                 allow-selection?}
-              controlled-input?       (assoc :value value)
-              (not controlled-input?) (assoc :default-value value-internal))]
-           [token-name-text theme (if crypto? token currency)]]]
-         [button/button
-          {:icon                true
-           :icon-only?          true
-           :size                32
-           :on-press            handle-on-swap
-           :type                :outline
-           :accessibility-label :reorder}
-          :i/reorder]]))))
+  [{:keys [token-symbol on-token-press value error? on-swap currency-symbol]}]
+  (let [theme        (quo.theme/use-theme)
+        window-width (:width (rn/get-window))]
+    [rn/pressable
+     {:style    {:width          "100%"
+                 :flex-direction :row}
+      :on-press on-token-press}
+     [token/view
+      {:token token-symbol
+       :size  :size-32}]
+     [rn/view {:style (style/input-container window-width)}
+      [rn/text-input
+       {:style                  (style/text-input theme error?)
+        :placeholder-text-color (style/placeholder-text theme)
+        :placeholder            "0"
+        :keyboard-type          :numeric
+        :editable               false
+        :value                  value}]
+      [token-name-text theme currency-symbol]]
+     [button/button
+      {:icon                true
+       :icon-only?          true
+       :size                32
+       :on-press            #(when on-swap (on-swap))
+       :type                :outline
+       :accessibility-label :reorder}
+      :i/reorder]]))

 (defn- view-internal
-  [{:keys [container-style value on-swap] :as props}]
-  (let [theme                               (quo.theme/use-theme)
-        width                               (:width (rn/get-window))
-        [value-internal set-value-internal] (rn/use-state nil)
-        [crypto? set-crypto]                (rn/use-state true)
-        handle-on-swap                      (rn/use-callback
-                                             (fn []
-                                               (set-crypto (not crypto?))
-                                               (when on-swap (on-swap (not crypto?))))
-                                             [crypto? on-swap])]
+  [{:keys [token-symbol
+           value
+           on-token-press
+           error?
+           container-style
+           on-swap
+           converted-value
+           hint-component
+           currency-symbol]}]
+  (let [theme (quo.theme/use-theme)
+        width (:width (rn/get-window))]
    [rn/view {:style (merge (style/main-container width) container-style)}
     [rn/view {:style style/amount-container}
      [input-section
-       (assoc props
-              :value-internal     value-internal
-              :theme              theme
-              :set-value-internal set-value-internal
-              :handle-on-swap     handle-on-swap
-              :crypto?            crypto?)]]
+       {:theme           theme
+        :token-symbol    token-symbol
+        :on-token-press  on-token-press
+        :value           value
+        :error?          error?
+        :on-swap         on-swap
+        :currency-symbol currency-symbol}]]
     [divider-line/view {:container-style (style/divider theme)}]
-     [data-info
-      (assoc props
-             :theme   theme
-             :crypto? crypto?
-             :amount  (or value value-internal))]]))
+     [rn/view {:style style/data-container}
+      hint-component
+      [text/text
+       {:size   :paragraph-2
+        :weight :medium
+        :style  (style/converted-amount theme)}
+       converted-value]]]))

 (def view (schema/instrument #'view-internal component-schema/?schema))
@@ -1,6 +1,8 @@
 (ns status-im.common.controlled-input.utils
  (:require
-    [clojure.string :as string]))
+    [clojure.string :as string]
+    [status-im.contexts.wallet.common.utils :as wallet-utils]
+    [utils.money :as money]))

 (def init-state
  {:value       ""
@@ -14,7 +16,7 @@

 (defn numeric-value
  [state]
-  (or (parse-double (input-value state)) 0))
+  (money/bignumber (input-value state)))

 (defn input-error
  [state]
@@ -26,23 +28,27 @@

 (defn upper-limit
  [state]
-  (:upper-limit state))
+  (money/bignumber (:upper-limit state)))

 (defn lower-limit
  [state]
-  (:lower-limit state))
+  (money/bignumber (:lower-limit state)))

 (defn upper-limit-exceeded?
  [state]
-  (and
-   (upper-limit state)
-   (> (numeric-value state) (upper-limit state))))
+  (let [num-value (numeric-value state)]
+    (and
+     (upper-limit state)
+     (when (money/bignumber? num-value)
+       (money/greater-than (numeric-value state) (upper-limit state))))))

-(defn lower-limit-exceeded?
+(defn- lower-limit-exceeded?
  [state]
-  (and
-   (lower-limit state)
-   (< (numeric-value state) (lower-limit state))))
+  (let [num-value (numeric-value state)]
+    (and
+     (lower-limit state)
+     (when (money/bignumber? num-value)
+       (money/less-than (numeric-value state) (lower-limit state))))))

 (defn- recheck-errorness
  [state]
@@ -75,13 +81,11 @@

 (defn increase
  [state]
-  (let [new-val (inc (numeric-value state))]
-    (set-input-value state (str new-val))))
+  (set-input-value state (str (money/add (numeric-value state) 1))))

 (defn decrease
  [state]
-  (let [new-val (dec (numeric-value state))]
-    (set-input-value state (str new-val))))
+  (set-input-value state (str (money/add (numeric-value state) -1))))

 (def ^:private not-digits-or-dot-pattern
  #"[^0-9+\.]")
@@ -130,3 +134,29 @@
 (defn empty-value?
  [state]
  (string/blank? (:value state)))
+
+(defn- fiat->crypto
+  [value conversion-rate]
+  (-> value
+      (money/fiat->crypto conversion-rate)
+      (wallet-utils/cut-crypto-decimals-to-fit-usd-cents conversion-rate)))
+
+(defn- crypto->fiat
+  [value conversion-rate]
+  (-> value
+      (money/crypto->fiat conversion-rate)
+      (wallet-utils/cut-fiat-balance-to-two-decimals)))
+
+(defn ->crypto
+  [state conversion-rate]
+  (-> state
+      (set-input-value (fiat->crypto (input-value state) conversion-rate))
+      (set-upper-limit (fiat->crypto (upper-limit state) conversion-rate))
+      (set-lower-limit (fiat->crypto (lower-limit state) conversion-rate))))
+
+(defn ->fiat
+  [state conversion-rate]
+  (-> state
+      (set-input-value (crypto->fiat (input-value state) conversion-rate))
+      (set-upper-limit (crypto->fiat (upper-limit state) conversion-rate))
+      (set-lower-limit (crypto->fiat (lower-limit state) conversion-rate))))
@@ -200,13 +200,13 @@
     (.remove keyboard-hide-listener))))

 (defn screen
-  [{:keys [initial-insets title keypair navigation-icon recovering-keypair? render-controls]}]
-  (let [{navigation-bar-top :top} initial-insets
-        banner-offset             (rf/sub [:alert-banners/top-margin])]
+  [{:keys [title keypair navigation-icon recovering-keypair? render-controls]}]
+  (let [[insets _]    (rn/use-state (safe-area/get-insets))
+        banner-offset (rf/sub [:alert-banners/top-margin])]
    [rn/view {:style style/full-layout}
     [rn/keyboard-avoiding-view {:style style/page-container}
      [quo/page-nav
-       {:margin-top navigation-bar-top
+       {:margin-top (:top insets)
        :background :blur
        :icon-name  (or navigation-icon
                        (if recovering-keypair? :i/close :i/arrow-left))
@@ -216,15 +216,14 @@
        :keypair             keypair
        :render-controls     render-controls
        :banner-offset       banner-offset
-        :initial-insets      initial-insets
+        :initial-insets      insets
        :recovering-keypair? recovering-keypair?}]]]))

 (defn view
  []
-  (let [insets (safe-area/get-insets)]
-    (fn []
-      (let [{:keys [recovering-keypair?]} (rf/sub [:get-screen-params])]
-        [screen
-         {:title               (i18n/label :t/use-recovery-phrase)
-          :initial-insets      insets
-          :recovering-keypair? recovering-keypair?}]))))
+  (let [{:keys [recovering-keypair?]} (rf/sub [:get-screen-params])]
+    (rn/use-unmount
+     #(rf/dispatch [:onboarding/clear-navigated-to-enter-seed-phrase-from-screen]))
+    [screen
+     {:title               (i18n/label :t/use-recovery-phrase)
+      :recovering-keypair? recovering-keypair?}]))
@@ -61,7 +61,7 @@
 (defn view
  [{:keys [header footer customization-color footer-container-padding header-container-style
           content-container-style gradient-cover? keyboard-should-persist-taps shell-overlay?
-           blur-options content-avoid-keyboard?]
+           blur-options content-avoid-keyboard? automatically-adjust-keyboard-insets]
    :or   {footer-container-padding (safe-area/get-top)}}
   & children]
  (reagent/with-let [scroll-view-ref              (atom nil)
@@ -123,7 +123,7 @@
           :scroll-event-throttle                64
           :content-container-style              {:flex-grow 1}
           :always-bounce-vertical               @keyboard-did-show?
-           :automatically-adjust-keyboard-insets true
+           :automatically-adjust-keyboard-insets automatically-adjust-keyboard-insets
           :shows-vertical-scroll-indicator      false
           :keyboard-should-persist-taps         keyboard-should-persist-taps}
          (into [rn/view
@@ -94,3 +94,11 @@
 (fn [params]
   (doseq [param params]
     (call param))))
+
+(defn log-rpc-error
+  [_ [{:keys [event params]} error]]
+  (log/error (str "Failed to " event)
+             {:params params
+              :error  error}))
+
+(rf/reg-event-fx :log-rpc-error log-rpc-error)
@@ -17,7 +17,7 @@
  (let [parsed-time       (t.format/parse (t.format/formatters :date-time-no-ms) muted-till-string)
        hours-and-minutes (str (add-leading-zero (t/hour (t/plus parsed-time time-zone-offset)))
                               ":"
-                               (add-leading-zero (t/minute parsed-time)))
+                               (add-leading-zero (t/minute (t/plus parsed-time time-zone-offset))))
        when-to-unmute    (cond (= go-default-time
                                   muted-till-string)   (i18n/label :t/until-you-turn-it-back-on)
                                (today? parsed-time)    (str hours-and-minutes " today")
@@ -90,7 +90,10 @@
    :dark  (js/require "../resources/images/ui2/sweating-man-dark.png")}
   :no-pinned-messages
   {:light (js/require "../resources/images/ui2/no-pinned-messages-light.png")
-    :dark  (js/require "../resources/images/ui2/no-pinned-messages-dark.png")}})
+    :dark  (js/require "../resources/images/ui2/no-pinned-messages-dark.png")}
+   :no-assets
+   {:light (js/require "../resources/images/ui2/no-assets-light.png")
+    :dark  (js/require "../resources/images/ui2/no-assets-dark.png")}})

 (def mock-images
  {:bored-ape             (js/require "../resources/images/mock2/bored-ape.png")
@@ -24,7 +24,7 @@

 (def web-prefixes ["https://" "http://" "https://www." "http://www."])

-(def web2-domain "status.app")
+(def status-web2-domain "status.app")

 (def user-path "u#")
 (def user-with-data-path "u/")
@@ -32,13 +32,17 @@
 (def community-with-data-path "c/")
 (def channel-path "cc/")

-(def web-urls (map #(str % web2-domain "/") web-prefixes))
+(def status-web-urls (map #(str % status-web2-domain "/") web-prefixes))

-(defn path-urls
+(defn prepend-status-urls
  [path]
-  (map #(str % path) web-urls))
+  (map #(str % path) status-web-urls))

-(def handled-schemes (set (into uri-schemes web-urls)))
+(def handled-schemes (set (into uri-schemes status-web-urls)))
+
+(defn wc-normalize-uri
+  [uri]
+  (if (string/includes? uri "//wc:") (string/replace-first uri "/?" "?") uri))

 (def group-chat-extractor
  {[#"(.*)" :params] {""  :group-chat
@@ -59,7 +63,9 @@
                     ["wallet/" :account]                       :wallet-account
                     [user-with-data-path :user-data]           :user
                     "c"                                        :community
-                     "u"                                        :user}
+                     "u"                                        :user
+                     #"wc:([^\?]+)"                             :wallet-connect
+                     "wc"                                       :wallet-connect}
    ethereum-scheme eip-extractor}])

 (defn parse-query-params
@@ -74,6 +80,11 @@
    (when-not (string/blank? fragment)
      fragment)))

+(defn remove-scheme
+  [uri]
+  (let [[_ url] (string/split uri #"://")]
+    url))
+
 (defn match-uri
  [uri]
  (let [;; bidi has trouble parse path with `=` in it extract `=` here and add back to parsed
@@ -87,13 +98,17 @@
        uri-without-equal-in-path
        (if equal-end-of-base64url (string/replace-first uri equal-end-of-base64url "") uri)

+        ;;bidi has issue to detect wc regex with /?, couldn't fine any other workaround
+        normalize-uri
+        (wc-normalize-uri uri-without-equal-in-path)
+
        ;; fragment is the one after `#`, usually user-id, ens-name, community-id
        fragment (parse-fragment uri)
        ens? (utils.ens/is-valid-eth-name? fragment)
        compressed-key? (validators/valid-compressed-key? fragment)

-        {:keys [handler route-params] :as parsed}
-        (assoc (bidi/match-route routes uri-without-equal-in-path)
+        {:keys [handler route-params query-params] :as parsed}
+        (assoc (bidi/match-route routes normalize-uri)
               :uri          uri
               :query-params (parse-query-params uri))]
    (cond-> parsed
@@ -130,7 +145,13 @@
      (update-in [:route-params :user-data] #(str % equal-end-of-base64url))

      (and (= handler :user) compressed-key?)
-      (assoc-in [:route-params :user-id] fragment))))
+      (assoc-in [:route-params :user-id] fragment)
+
+      (= handler :wallet-connect)
+      (assoc-in [:route-params :uri]
+       (if (get query-params "uri")
+         (get query-params "uri")
+         (remove-scheme normalize-uri))))))

 (defn match-contact-async
  [chain {:keys [user-id ens-name]} callback]
@@ -327,6 +348,10 @@
      (= handler :wallet-account)
      (cb (match-wallet-account route-params))

+      (= handler :wallet-connect)
+      (cb {:type :wallet-connect
+           :uri  (:uri route-params)})
+
      (address/address? uri)
      (cb (address->eip681 uri))

@@ -105,6 +105,12 @@
  [full-url]
  (log/info "universal-links: no handler for " full-url))

+(rf/defn handle-wallet-connect
+  [_ uri]
+  (log/info "universal-links: handle-wallet-connect" uri)
+  {:dispatch-later {:ms       1500
+                    :dispatch [:wallet-connect/on-scan-connection uri]}})
+
 (defn dispatch-url
  "Dispatch url so we can get access to re-frame/db"
  [url]
@@ -117,7 +123,7 @@

 (rf/defn on-handle
  {:events [:universal-links/match-value]}
-  [cofx url {:keys [type chat-id community-id] :as data}]
+  [cofx url {:keys [type chat-id community-id uri] :as data}]
  (case type
    :group-chat         (handle-group-chat cofx data)
    :private-chat       (handle-private-chat cofx data)
@@ -130,6 +136,7 @@
    :browser            (handle-browse cofx data)
    :eip681             (handle-eip681 cofx data)
    :wallet-account     (handle-wallet-account cofx data)
+    :wallet-connect     (handle-wallet-connect cofx uri)
    (handle-not-found url)))

 (rf/defn route-url
@@ -178,13 +185,10 @@
  [{:keys [db]} [{:keys [public-key on-success]}]]
  (let [profile-public-key (get-in db [:profile/profile :public-key])
        profile?           (or (not public-key) (= public-key profile-public-key))
-        ens-name?          (if profile?
-                             (get-in db [:profile/profile :ens-name?])
-                             (get-in db [:contacts/contacts public-key :ens-name]))
        public-key         (if profile? profile-public-key public-key)]
    (when public-key
      {:json-rpc/call
-       [{:method     (if ens-name? "wakuext_shareUserURLWithENS" "wakuext_shareUserURLWithData")
+       [{:method     "wakuext_shareUserURLWithData"
         :params     [public-key]
         :on-success (fn [url]
                       (rf/dispatch [:universal-links/save-profile-url public-key url])
@@ -45,8 +45,8 @@
      (let [db  {:profile/profile {:ens-name? true :public-key pubkey}}
            rst (links/generate-profile-url {:db db} [])]
        (are [result expected] (match? result expected)
-         "wakuext_shareUserURLWithENS" (-> rst :json-rpc/call first :method)
-         pubkey                        (-> rst :json-rpc/call first :params first)))))
+         "wakuext_shareUserURLWithData" (-> rst :json-rpc/call first :method)
+         pubkey                         (-> rst :json-rpc/call first :params first)))))
  (testing "user has no ens name"
    (testing "it calls the ens rpc method with public keyas param"
      (let [db  {:profile/profile {:public-key pubkey}}
@@ -60,8 +60,8 @@
            db  {:contacts/contacts {pubkey {:ens-name ens}}}
            rst (links/generate-profile-url {:db db} [{:public-key pubkey}])]
        (are [result expected] (match? result expected)
-         "wakuext_shareUserURLWithENS" (-> rst :json-rpc/call first :method)
-         pubkey                        (-> rst :json-rpc/call first :params first)))))
+         "wakuext_shareUserURLWithData" (-> rst :json-rpc/call first :method)
+         pubkey                         (-> rst :json-rpc/call first :params first)))))
  (testing "contact has no ens name"
    (testing "it calls the ens rpc method with public keyas param"
      (let [db  {:contacts/contacts {pubkey {:public-key pubkey}}}
@@ -260,9 +260,7 @@
 (def regx-community-universal-link #"((^https?://status.app/)|(^status-app://))c/([\x00-\x7F]+)$")
 (def regx-deep-link #"((^ethereum:.*)|(^status-app://[\x00-\x7F]+$))")
 (def regx-ens #"^(?=.{5,255}$)([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$")
-(def regx-multichain-address #"^(?:(?:eth:|arb1:|oeth:)(?=:|))*0x[0-9a-fA-F]{40}$")

-(def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")
 (def regx-starts-with-uuid #"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 (def regx-full-or-partial-address #"^0x[a-fA-F0-9]{1,40}$")

@@ -553,6 +551,7 @@
 (def ^:const send-type-bridge 5)
 (def ^:const send-type-erc-721-transfer 6)
 (def ^:const send-type-erc-1155-transfer 7)
+(def ^:const send-type-swap 8)

 (def ^:const multi-transaction-type-send 0)
 (def ^:const multi-transaction-type-approve 1)
@@ -566,6 +565,7 @@
 (def ^:const bridge-name-erc-721-transfer "ERC721Transfer")
 (def ^:const bridge-name-erc-1155-transfer "ERC1155Transfer")
 (def ^:const bridge-name-hop "Hop")
+(def ^:const bridge-name-paraswap "Paraswap")

 (def ^:const bridge-assets #{"ETH" "USDT" "USDC" "DAI"})

@@ -586,13 +586,26 @@

 (def ^:const contact-item-height 56)

+(def ^:const currency-item-height 64)
+
 (def ^:const slippages [0.1 0.5 1])
 (def ^:const default-slippage 0.5)
 (def ^:const max-recommended-slippage 5)
 (def ^:const max-slippage-decimal-places 2)
-(def ^:const swap-default-provider
+(def ^:const swap-provider-paraswap
  {:name                     :paraswap
   :full-name                "Paraswap"
   :color                    :blue
   :contract-address         "0xdef171fe48cf0115b1d80b88dc8eab59176fee57"
   :terms-and-conditions-url "https://files.paraswap.io/tos_v4.pdf"})
+(def ^:const swap-providers
+  {:paraswap swap-provider-paraswap})
+
+(def ^:const token-for-fees-symbol "ETH")
+
+(def ^:const transaction-status-success "Success")
+(def ^:const transaction-status-pending "Pending")
+(def ^:const transaction-status-failed "Failed")
+
+(def ^:const min-token-decimals-to-display 6)
+(def ^:const swap-proposal-refresh-interval-ms 15000)
@@ -50,7 +50,7 @@
           item])))))

 (defn add-manage-members
-  [{:keys [scroll-enabled? on-scroll]}]
+  [{:keys [on-scroll]}]
  (let [theme                      (quo.theme/use-theme)
        selected-participants      (rf/sub [:group-chat/selected-participants])
        deselected-members         (rf/sub [:group-chat/deselected-members])
@@ -58,6 +58,9 @@
        {:keys [admins] :as group} (rf/sub [:chats/chat-by-id chat-id])
        current-pk                 (rf/sub [:multiaccount/public-key])
        admin?                     (get admins current-pk)]
+    (rn/use-mount (fn []
+                    (rf/dispatch [:group/clear-added-participants])
+                    (rf/dispatch [:group/clear-removed-members])))
    [rn/view {:flex 1 :margin-top 20}
     [rn/touchable-opacity
      {:on-press            #(rf/dispatch [:navigate-back])
@@ -71,7 +74,6 @@
      (i18n/label (if admin? :t/manage-members :t/add-members))]
     [gesture/section-list
      {:key-fn                         :title
-       :scroll-enabled                 @scroll-enabled?
       :on-scroll                      on-scroll
       :sticky-section-headers-enabled false
       :sections                       (rf/sub [:contacts/grouped-by-first-letter])
@@ -174,11 +176,8 @@
                          :icon                :i/add-user
                          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
                          :counter-value       (count contacts)
-                          :on-press            (fn []
-                                                 (rf/dispatch [:group/clear-added-participants])
-                                                 (rf/dispatch [:group/clear-removed-members])
-                                                 (rf/dispatch [:open-modal :group-add-manage-members
-                                                               chat-id]))}]}]
+                          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members
+                                                              chat-id])}]}]
     [rn/section-list
      {:key-fn                         :title
       :sticky-section-headers-enabled false
@@ -26,7 +26,7 @@
    (h/render [audio-message/audio-message message context])
    (h/is-truthy (h/get-by-label-text :audio-message-container)))

-  (h/test "press play calls audio/toggle-playpause-player"
+  (h/test-skip "press play calls audio/toggle-playpause-player"
    (with-redefs [audio/toggle-playpause-player     (js/jest.fn)
                  audio/new-player                  (fn [_ _ _] {})
                  audio/prepare-player              (fn [_ on-success _] (on-success))
@@ -97,7 +97,7 @@
  [{:keys [outgoing content pinned-by outgoing-status deleted? deleted-for-me? content-type
           bridge-message]
    :as   message-data}
-   {:keys [able-to-send-message? community? can-delete-message-for-everyone?
+   {:keys [able-to-send-message? community? community-member? can-delete-message-for-everyone?
           message-pin-enabled group-chat group-admin?]}]
  (concat
   (when (and outgoing
@@ -131,7 +131,8 @@
       :id                  :copy}])
   ;; pinning images are temporarily disabled
   (when (and message-pin-enabled
-              (not= content-type constants/content-type-image))
+              (not= content-type constants/content-type-image)
+              (or community-member? (not community?)))
     [{:type                :main
       :on-press            #(pin-message message-data)
       :label               (i18n/label (if pinned-by
@@ -5,6 +5,8 @@
    [react-native.reanimated :as reanimated]
    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))

+(def permission-context-height 46)
+
 (defn keyboard-avoiding-container
  [theme]
  {:flex             1
@@ -73,3 +75,8 @@
  (reanimated/apply-animations-to-style
   {:top top}
   {:row-gap 16}))
+
+(defn permission-context-sheet
+  [margin-bottom?]
+  {:flex          3 ;; Pushes composer to bottom
+   :margin-bottom (when margin-bottom? permission-context-height)})
@@ -400,16 +400,18 @@
        {:keys [keyboard-shown]}             (hooks/use-keyboard)
        {window-height :height}              (rn/get-window)
        context                              (rf/sub [:chats/current-chat-message-list-view-context])
+        able-to-send-message?                (:able-to-send-message? context)
        messages                             (rf/sub [:chats/raw-chat-messages-stream chat-id])
+        margin-bottom?                       (and community-channel? (not able-to-send-message?))
        recording?                           (rf/sub [:chats/recording?])]
-    [rn/view {:style {:flex 3}} ;; Pushes composer to bottom
+    [rn/view {:style (style/permission-context-sheet margin-bottom?)}
     [rn/view {:style {:flex-shrink 1}} ;; Keeps flat list on top
      [reanimated/flat-list
       {:key-fn                            list-key-fn
        :ref                               list-ref
        :bounces                           false
        :header                            [:<>
-                                            [list-header insets (:able-to-send-message? context)]
+                                            [list-header insets able-to-send-message?]
                                            (when (= (:chat-type chat) constants/private-group-chat-type)
                                              [list-group-chat-header chat])]
        :footer                            [list-footer
@@ -25,7 +25,7 @@
                  token-permissions-check id last-opened-at]
           :as   community}       (data-store.communities/<-rpc community-js)
          previous-last-opened-at (get-in db [:communities id :last-opened-at])]
-      (when (> clock (get-in db [:communities id :clock]))
+      (when (>= clock (get-in db [:communities id :clock]))
        {:db (assoc-in db
              [:communities id]
              (assoc community :last-opened-at (max last-opened-at previous-last-opened-at)))
@@ -181,9 +181,4 @@

    (testing "given a community with lower clock"
      (let [effects (events/handle-community {:db {:communities {community-id {:clock 3}}}} [community])]
-        (is (nil? effects))))
-
-    (testing "given a community without clock"
-      (let [community #js {:id community-id}
-            effects   (events/handle-community {} [community])]
        (is (nil? effects))))))
@@ -74,7 +74,7 @@
 (fn [{:keys [db]} [contact-id]]
   {:db (update-in db
                   [:contacts/contacts contact-id]
-                   #(assoc % :blocked? false :added true :active? true))}))
+                   #(assoc % :blocked? false))}))

 (rf/reg-event-fx :contact/unblock-contact
 (fn [_ [contact-id]]
@@ -193,6 +193,7 @@
     {:header [page-nav]
      :keyboard-should-persist-taps :handled
      :content-avoid-keyboard? true
+      :automatically-adjust-keyboard-insets true
      :blur-options
      {:blur-amount        34
       :blur-radius        20
@@ -59,7 +59,7 @@
       [rn/view {:style (style/view-button-container false)}
        children])]))

-(defn- f-page
+(defn- page
  [{:keys [onboarding-profile-data navigation-bar-top]}]
  (reagent/with-let [show-keyboard?                          (reagent/atom false)
                     content-scroll-y                        (reagent/atom 0)
@@ -205,7 +205,6 @@
  []
  (let [{:keys [top]}           (safe-area/get-insets)
        onboarding-profile-data (rf/sub [:onboarding/profile])]
-    [:<>
-     [:f> f-page
-      {:navigation-bar-top      top
-       :onboarding-profile-data onboarding-profile-data}]]))
+    [page
+     {:navigation-bar-top      top
+      :onboarding-profile-data onboarding-profile-data}]))
@@ -10,15 +10,16 @@
    [utils.re-frame :as rf]
    [utils.security.core :as security]))

-(rf/defn profile-data-set
-  {:events [:onboarding/profile-data-set]}
-  [{:keys [db]} onboarding-data]
-  {:db       (update db :onboarding/profile merge onboarding-data)
-   :dispatch [:navigate-to-within-stack
-              [:screen/onboarding.create-profile-password
-               (get db
-                    :onboarding/navigated-to-enter-seed-phrase-from-screen
-                    :screen/onboarding.new-to-status)]]})
+(rf/reg-event-fx
+ :onboarding/profile-data-set
+ (fn [{:keys [db]} [onboarding-data]]
+   (let [navigate-from-screen (get db
+                                   :onboarding/navigated-to-enter-seed-phrase-from-screen
+                                   :screen/onboarding.new-to-status)]
+     {:db (update db :onboarding/profile merge onboarding-data)
+      :fx [[:dispatch
+            [:navigate-to-within-stack
+             [:screen/onboarding.create-profile-password navigate-from-screen]]]]})))

 (rf/defn enable-biometrics
  {:events [:onboarding/enable-biometrics]}
@@ -33,6 +34,11 @@
   {:db (assoc db :onboarding/navigated-to-enter-seed-phrase-from-screen from-screen)
    :fx [[:dispatch [:navigate-to-within-stack [:screen/onboarding.enter-seed-phrase from-screen]]]]}))

+(rf/reg-event-fx
+ :onboarding/clear-navigated-to-enter-seed-phrase-from-screen
+ (fn [{:keys [db]}]
+   {:db (dissoc db :onboarding/navigated-to-enter-seed-phrase-from-screen)}))
+
 (rf/reg-event-fx :onboarding/navigate-to-enable-notifications-from-syncing
 (fn [{:keys [db]}]
   {:db       (dissoc db :onboarding/profile)
@@ -2,9 +2,13 @@
  (:require
    [quo.core :as quo]
    [quo.foundations.resources :as resources]
+    [react-native.core :as rn]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
-    [status-im.contexts.preview.quo.preview :as preview]))
+    [status-im.common.controlled-input.utils :as controlled-input]
+    [status-im.contexts.preview.quo.preview :as preview]
+    [status-im.contexts.wallet.common.utils :as utils]
+    [utils.money :as money]))

 (def networks
  [{:source (resources/get-network :arbitrum)}
@@ -12,47 +16,75 @@
   {:source (resources/get-network :ethereum)}])

 (def title "Max: 200 SNT")
+(def conversion-rate 3450.28)

 (def descriptor
-  [{:key     :token
+  [{:key     :token-symbol
    :type    :select
    :options [{:key :eth}
              {:key :snt}]}
   {:key     :currency
    :type    :select
-    :options [{:key :usd}
-              {:key :eur}]}
+    :options [{:key "$"}
+              {:key "€"}]}
   {:key  :error?
-    :type :boolean}
-   {:key  :allow-selection?
    :type :boolean}])

+
 (defn view
  []
-  (let [state     (reagent/atom {:token               :eth
-                                 :currency            :usd
-                                 :conversion          0.02
-                                 :networks            networks
-                                 :title               title
-                                 :customization-color :blue
-                                 :show-keyboard?      false
-                                 :allow-selection?    true})
-        value     (reagent/atom "")
-        set-value (fn [v]
-                    (swap! value str v))
-        delete    (fn [_]
-                    (swap! value #(subs % 0 (dec (count %)))))]
+  (let [state (reagent/atom {:token-symbol :eth
+                             :currency     "$"
+                             :crypto?      true
+                             :error?       false})]
    (fn []
-      [preview/preview-container
-       {:state                     state
-        :descriptor                descriptor
-        :full-screen?              true
-        :component-container-style {:flex            1
-                                    :justify-content :space-between}}
-       [quo/token-input (assoc @state :value @value)]
-       [quo/numbered-keyboard
-        {:container-style {:padding-bottom (safe-area/get-top)}
-         :left-action     :dot
-         :delete-key?     true
-         :on-press        set-value
-         :on-delete       delete}]])))
+      (let [{:keys [currency token-symbol crypto? error?]} @state
+            [input-state set-input-state]                  (rn/use-state controlled-input/init-state)
+            input-amount                                   (controlled-input/input-value input-state)
+            swap-between-fiat-and-crypto                   (fn []
+                                                             (if crypto?
+                                                               (set-input-state #(controlled-input/->fiat
+                                                                                  %
+                                                                                  conversion-rate))
+                                                               (set-input-state
+                                                                #(controlled-input/->crypto
+                                                                  %
+                                                                  conversion-rate))))
+            converted-value                                (if crypto?
+                                                             (utils/prettify-balance currency
+                                                                                     (money/crypto->fiat
+                                                                                      input-amount
+                                                                                      conversion-rate))
+                                                             (utils/prettify-crypto-balance
+                                                              (or (clj->js token-symbol) "")
+                                                              (money/fiat->crypto input-amount
+                                                                                  conversion-rate)
+                                                              conversion-rate))]
+        [preview/preview-container
+         {:state                     state
+          :descriptor                descriptor
+          :full-screen?              true
+          :component-container-style {:flex            1
+                                      :justify-content :space-between}}
+         [quo/token-input
+          {:token-symbol    token-symbol
+           :currency-symbol (if crypto? token-symbol currency)
+           :error?          error?
+           :value           input-amount
+           :converted-value converted-value
+           :on-swap         (fn []
+                              (swap! state assoc :crypto? (not crypto?))
+                              (swap-between-fiat-and-crypto))
+           :hint-component  [quo/network-tags
+                             {:networks networks
+                              :title    title
+                              :status   (when (:error? @state) :error)}]}]
+         [quo/numbered-keyboard
+          {:container-style {:padding-bottom (safe-area/get-top)}
+           :left-action     :dot
+           :delete-key?     true
+           :on-press        (fn [c]
+                              (set-input-state #(controlled-input/add-character % c)))
+
+           :on-delete       (fn []
+                              (set-input-state controlled-input/delete-last))}]]))))
@@ -1,7 +1,6 @@
 (ns status-im.contexts.profile.create.events
  (:require
    [native-module.core :as native-module]
-    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
    [status-im.contexts.profile.config :as profile.config]
    status-im.contexts.profile.create.effects
    [utils.re-frame :as rf]
@@ -17,5 +16,4 @@
            :displayName        display-name
            :password           login-sha3-password
            :imagePath          (profile.config/strip-file-prefix image-path)
-            :customizationColor color
-            :emoji              (emoji-picker.utils/random-emoji))}))
+            :customizationColor color)}))
@@ -11,18 +11,18 @@

 (defn items
  [theme]
-  (let [profile             (rf/sub [:profile/profile-with-image])
-        customization-color (rf/sub [:profile/customization-color])
-        bio                 (:bio profile)
-        full-name           (profile.utils/displayed-name profile)]
+  (let [{:keys [bio ens-name?] :as profile} (rf/sub [:profile/profile-with-image])
+        customization-color                 (rf/sub [:profile/customization-color])
+        full-name                           (profile.utils/displayed-name profile)]
    [{:label (i18n/label :t/profile)
-      :items [{:title           (i18n/label :t/name)
-               :on-press        #(rf/dispatch [:open-modal :edit-name])
-               :blur?           true
-               :label           :text
-               :label-props     (utils/truncate-str full-name constants/profile-name-max-length)
-               :action          :arrow
-               :container-style style/item-container}
+      :items [(cond-> {:title           (i18n/label :t/name)
+                       :blur?           true
+                       :label           :text
+                       :label-props     (utils/truncate-str full-name constants/profile-name-max-length)
+                       :container-style style/item-container}
+                (not ens-name?)
+                (assoc :on-press #(rf/dispatch [:open-modal :edit-name])
+                       :action   :arrow))
              {:title           (i18n/label :t/bio)
               :on-press        #(rf/dispatch [:open-modal :edit-bio])
               :blur?           true
@@ -95,6 +95,7 @@
           [:dispatch-later [{:ms 1500 :dispatch [:profile.login/non-critical-initialization]}]]
           [:dispatch [:network/check-expensive-connection]]
           [:profile.settings/get-profile-picture key-uid]
+           [:settings/get-currencies]
           (when (ff/enabled? ::ff/wallet.wallet-connect)
             [:dispatch [:wallet-connect/init]])
           (when notifications-enabled?
@@ -5,7 +5,6 @@
    [react-native.core :as rn]
    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
-    [status-im.common.check-before-syncing.view :as check-before-syncing]
    [status-im.common.confirmation-drawer.view :as confirmation-drawer]
    [status-im.common.metrics-confirmation-modal.view :as metrics-modal]
    [status-im.common.standard-authentication.core :as standard-authentication]
@@ -44,32 +43,32 @@
                                              :linear
                                              50))

-(defn- show-check-before-syncing
+(defn- navigate-to-new-to-status
  []
-  (rf/dispatch
-   [:show-bottom-sheet
-    {:content (fn [] [check-before-syncing/view
-                      {:on-submit
-                       #(debounce/throttle-and-dispatch
-                         [:open-modal :screen/onboarding.sign-in]
-                         1000)}])
-     :shell?  true}]))
+  (when @push-animation-fn-atom
+    (@push-animation-fn-atom))
+  (debounce/throttle-and-dispatch
+   [:open-modal :screen/onboarding.new-to-status]
+   1000))
+
+(defn- navigate-to-sync-or-recover-profile
+  []
+  (when @push-animation-fn-atom
+    (@push-animation-fn-atom))
+  (debounce/throttle-and-dispatch
+   [:open-modal :screen/onboarding.sync-or-recover-profile]
+   1000))

 (defn new-account-options
  []
  [quo/action-drawer
   [[{:icon                :i/profile
      :label               (i18n/label :t/create-new-profile)
-      :on-press            (fn []
-                             (when @push-animation-fn-atom
-                               (@push-animation-fn-atom))
-                             (debounce/throttle-and-dispatch
-                              [:open-modal :screen/onboarding.new-to-status]
-                              1000))
+      :on-press            navigate-to-new-to-status
      :accessibility-label :create-new-profile}
     {:icon                :i/multi-profile
-      :label               (i18n/label :t/add-existing-status-profile)
-      :on-press            show-check-before-syncing
+      :label               (i18n/label :t/sync-or-recover-profile)
+      :on-press            navigate-to-sync-or-recover-profile
      :accessibility-label :multi-profile}]]])

 (defn show-new-account-options
@@ -1,7 +1,6 @@
 (ns status-im.contexts.profile.recover.events
  (:require
    [native-module.core :as native-module]
-    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
    [status-im.contexts.profile.config :as profile.config]
    status-im.contexts.profile.recover.effects
    [utils.re-frame :as rf]
@@ -23,5 +22,4 @@
             :password           login-sha3-password
             :imagePath          (profile.config/strip-file-prefix image-path)
             :customizationColor color
-             :emoji              (emoji-picker.utils/random-emoji)
             :fetchBackup        true})}))
@@ -151,3 +151,8 @@
          [{:method     "settings_mnemonicWasShown"
            :on-success #(log/debug "mnemonic was marked as shown")
            :on-error   #(log/error "mnemonic was not marked as shown" %)}]]]}))
+
+(rf/reg-event-fx :profile.settings/update-currency
+ (fn [_ [currency]]
+   {:fx [[:dispatch [:profile.settings/profile-update :currency currency]]
+         [:dispatch [:wallet/get-wallet-token-for-all-accounts]]]}))
@@ -85,13 +85,12 @@
     :image       :icon
     :blur?       true
     :action      :arrow}
-    (when config/show-not-implemented-features?
-      {:title       (i18n/label :t/language-and-currency)
-       :on-press    not-implemented/alert
-       :image-props :i/globe
-       :image       :icon
-       :blur?       true
-       :action      :arrow})]
+    {:title       (i18n/label :t/language-and-currency)
+     :on-press    #(rf/dispatch [:open-modal :screen/settings.language-and-currency])
+     :image-props :i/globe
+     :image       :icon
+     :blur?       true
+     :action      :arrow}]
   [(when config/show-not-implemented-features?
      {:title       (i18n/label :t/data-usage)
       :on-press    not-implemented/alert
@@ -0,0 +1,8 @@
+(ns status-im.contexts.settings.language-and-currency.currency.style)
+
+(def input-container
+  {:padding-horizontal 20
+   :padding-vertical   8})
+
+(def empty-results
+  {:margin-top 100})
@@ -0,0 +1,20 @@
+(ns status-im.contexts.settings.language-and-currency.currency.utils
+  (:require [status-im.constants :as constants]))
+
+(defn make-currency-item
+  "This function generates props for quo/category component item"
+  [{:keys [currency selected-currency on-change]}]
+  {:title             (if (:token? currency)
+                        (:short-name currency)
+                        (str (:short-name currency) " · " (:symbol currency)))
+   :description       :text
+   :description-props {:text (:name currency)}
+   :container-style   {:height constants/currency-item-height}
+   :image             (when (:token? currency) :token)
+   :image-props       {:token (:id currency)
+                       :size  :size-20}
+   :action            :selector
+   :action-props      {:type      :radio
+                       :blur?     true
+                       :checked?  (= selected-currency (:id currency))
+                       :on-change #(on-change (:id currency))}})
@@ -0,0 +1,84 @@
+(ns status-im.contexts.settings.language-and-currency.currency.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.resources :as resources]
+            [status-im.constants :as constants]
+            [status-im.contexts.settings.language-and-currency.currency.style :as style]
+            [status-im.contexts.settings.language-and-currency.currency.utils :as utils]
+            [status-im.contexts.settings.language-and-currency.data-store :as data-store]
+            [utils.debounce :as debounce]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
+(defn- get-item-layout
+  [_ index]
+  #js {:length constants/currency-item-height
+       :offset (* constants/currency-item-height index)
+       :index  index})
+
+(defn- settings-category-view
+  [{:keys [title data]} _ _ {:keys [selected-currency on-currency-press]}]
+  [rn/delay-render
+   [quo/category
+    {:label     title
+     :data      (map (fn [currency]
+                       (utils/make-currency-item
+                        {:currency          currency
+                         :selected-currency selected-currency
+                         :on-change         on-currency-press}))
+                     data)
+     :blur?     true
+     :list-type :settings}]])
+
+(defn view
+  []
+  (let [[search-text set-search-text] (rn/use-state "")
+        on-currency-press             (rn/use-callback #(rf/dispatch [:profile.settings/update-currency
+                                                                      %]))
+        selected-currency             (rf/sub [:profile/currency])
+        currencies                    (rf/sub [:currencies/categorized search-text])
+        on-change-text                (rn/use-callback
+                                       (debounce/debounce
+                                        #(set-search-text %)
+                                        300))
+        formatted-data                (rn/use-memo
+                                       #(data-store/get-formatted-currency-data currencies)
+                                       [search-text currencies])]
+    [quo/overlay
+     {:type       :shell
+      :top-inset? true}
+     [quo/page-nav
+      {:background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigate-back}]
+     [quo/page-top
+      {:title (i18n/label :t/currency)}]
+     [quo/input
+      {:small?          true
+       :blur?           true
+       :container-style style/input-container
+       :placeholder     (i18n/label :t/search-currencies)
+       :icon-name       :i/search
+       :on-change-text  on-change-text}]
+     (when (zero? (:total currencies))
+       [quo/empty-state
+        {:title           (i18n/label :t/no-result)
+         :image           (resources/get-themed-image :no-assets :dark)
+         :container-style style/empty-results
+         :description     (i18n/label :t/try-with-different-currency)}])
+     [rn/flat-list
+      {:data                            formatted-data
+       :render-data                     {:selected-currency selected-currency
+                                         :on-currency-press on-currency-press}
+       :render-fn                       settings-category-view
+       :get-item-layout                 get-item-layout
+       :initial-num-to-render           14
+       :max-to-render-per-batch         20
+       :scroll-event-throttle           16
+       :shows-vertical-scroll-indicator false
+       :bounces                         false
+       :over-scroll-mode                :never}]]))
@@ -0,0 +1,30 @@
+(ns status-im.contexts.settings.language-and-currency.data-store
+  (:require [clojure.set :as set]
+            [utils.i18n :as i18n]))
+
+(defn rpc->currency
+  [currency]
+  (some-> currency
+          (dissoc :unicode)
+          (set/rename-keys
+           {:shortName :short-name
+            :isPopular :popular?
+            :isToken   :token?})
+          (update :id keyword)))
+
+(defn rpc->currencies
+  [currencies]
+  (map rpc->currency currencies))
+
+(defn get-formatted-currency-data
+  [{:keys [popular crypto other]}]
+  (concat
+   (when (seq popular)
+     [{:title (i18n/label :t/popular-currencies)
+       :data  popular}])
+   (when (seq crypto)
+     [{:title (i18n/label :t/crypto)
+       :data  crypto}])
+   (when (seq other)
+     [{:title (i18n/label :t/all-currencies)
+       :data  other}])))
@@ -0,0 +1,56 @@
+(ns status-im.contexts.settings.language-and-currency.data-store-test
+  (:require
+    [cljs.test :refer-macros [deftest is testing]]
+    matcher-combinators.test
+    [status-im.contexts.settings.language-and-currency.data-store :as sut]))
+
+(def raw-currency-popular
+  {:id          "usd"
+   :shortName   "USD"
+   :name        "US Dollar"
+   :symbol      "$"
+   :emoji       "🇺🇸"
+   :isPopular   true
+   :isToken     false
+   :imageSource "https://example.com/image.png"})
+
+(def raw-currency-token
+  {:id          "btc"
+   :shortName   "BTC"
+   :name        "Bitcoin"
+   :symbol      ""
+   :emoji       ""
+   :isPopular   false
+   :isToken     true
+   :imageSource "https://example.com/image.png"})
+
+(deftest rpc->currency-test
+  (testing "transforms a currency"
+    (is
+     (match? {:id         :usd
+              :short-name "USD"
+              :symbol     "$"
+              :emoji      "🇺🇸"
+              :name       "US Dollar"
+              :popular?   true
+              :token?     false}
+             (sut/rpc->currency raw-currency-popular)))))
+
+(deftest rpc->currencies-test
+  (testing "transforms and sorts raw keypairs"
+    (is
+     (match? [(sut/rpc->currency raw-currency-popular)
+              (sut/rpc->currency raw-currency-token)]
+             (sut/rpc->currencies [raw-currency-popular
+                                   raw-currency-token])))))
+
+(deftest get-formatted-currency-data-test
+  (testing "returns formatted currency data"
+    (is
+     (match? [{:title "Popular currencies"
+               :data  [(sut/rpc->currency raw-currency-popular)]}
+              {:title "Crypto"
+               :data  [(sut/rpc->currency raw-currency-token)]}]
+             (sut/get-formatted-currency-data {:popular [(sut/rpc->currency raw-currency-popular)]
+                                               :crypto  [(sut/rpc->currency raw-currency-token)]
+                                               :other   []})))))
@@ -0,0 +1,18 @@
+(ns status-im.contexts.settings.language-and-currency.events
+  (:require [status-im.common.json-rpc.events :as json-rpc]
+            [status-im.contexts.settings.language-and-currency.data-store :as data-store]
+            [utils.collection]
+            [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :settings/get-currencies-success
+ (fn [{:keys [db]} [currencies]]
+   (let [all-currencies (data-store/rpc->currencies currencies)]
+     {:db (assoc db
+                 :currencies
+                 (utils.collection/index-by :id all-currencies))})))
+
+(rf/reg-fx :settings/get-currencies
+ (fn []
+   (json-rpc/call {:method     "appgeneral_getCurrencies"
+                   :on-success [:settings/get-currencies-success]
+                   :on-error   [:log-rpc-error {:event :settings/get-currencies}]})))
@@ -0,0 +1,27 @@
+(ns status-im.contexts.settings.language-and-currency.events-test
+  (:require
+    [cljs.test :refer-macros [is]]
+    matcher-combinators.test
+    status-im.contexts.settings.language-and-currency.events
+    [test-helpers.unit :as h]))
+
+(def raw-currency-popular
+  {:id          "usd"
+   :shortName   "USD"
+   :name        "US Dollar"
+   :symbol      "$"
+   :emoji       "🇺🇸"
+   :isPopular   true
+   :isToken     false
+   :imageSource "https://example.com/image.png"})
+
+(h/deftest-event :settings/get-currencies-success
+  [event-id dispatch]
+  (let [expected-effects {:db {:currencies {:usd {:id         :usd
+                                                  :short-name "USD"
+                                                  :symbol     "$"
+                                                  :emoji      "🇺🇸"
+                                                  :name       "US Dollar"
+                                                  :popular?   true
+                                                  :token?     false}}}}]
+    (is (match? expected-effects (dispatch [event-id [raw-currency-popular]])))))
@@ -0,0 +1,36 @@
+(ns status-im.contexts.settings.language-and-currency.view
+  (:require [quo.core :as quo]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
+(defn- on-currency-press
+  []
+  (rf/dispatch [:open-modal :screen/settings.currency-selection]))
+
+(defn view
+  []
+  (let [{:keys [name short-name token?]
+         :as   currency} (rf/sub [:profile/currency-info])
+        currency-title   (if token? name (str short-name " · " (:symbol currency)))]
+    [quo/overlay
+     {:type       :shell
+      :top-inset? true}
+     [quo/page-nav
+      {:background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigate-back}]
+     [quo/page-top
+      {:title (i18n/label :t/language-and-currency)}]
+     [quo/category
+      {:label     (i18n/label :t/currency)
+       :data      [{:title             currency-title
+                    :on-press          on-currency-press
+                    :description       :text
+                    :action            :arrow
+                    :description-props {:text name}}]
+       :blur?     true
+       :list-type :settings}]]))
@@ -95,7 +95,7 @@
                      show-profile-pictures-to
                      open-show-profile-pictures-to-options))
                   (setting-preview-privacy preview-privacy? customization-color toggle-preview-privacy)
-                   {:title             (i18n/label :t/share-usage-data)
+                   {:title             (i18n/label :t/share-usage-data-with-status)
                    :description       :text
                    :description-props {:text (i18n/label :t/from-all-profiles-on-device)}
                    :blur?             true
@@ -9,6 +9,7 @@
    [status-im.contexts.settings.wallet.saved-addresses.add-address-to-save.style :as style]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.common.validation :as validation]
+    [utils.address :as utils-address]
    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -31,7 +32,7 @@
      :own-account

      (not
-       (or (validation/eth-address? user-input)
+       (or (utils-address/eip-3770-address? user-input)
           (validation/ens-name? user-input)))
      :invalid-address-or-ens)))

@@ -9,25 +9,45 @@
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

+(defn- mention-text
+  [literal]
+  (let [mention (rf/sub [:messages/resolve-mention literal])]
+    [quo/text
+     {:style style/mention-text
+      :size  :paragraph-1}
+     (str "@" mention)]))
+
+(defn- parsed-text->hiccup
+  [{:keys [literal destination] message-type :type}]
+  (case message-type
+    "mention" [mention-text literal]
+    "link"    destination
+    literal))
+
 (defn- message-body
-  [message]
-  (let [parsed-text          (get-in message [:content :parsed-text])
-        parsed-text-children (:children (first parsed-text))]
-    (into [quo/text
-           {:number-of-lines     1
-            :style               style/tag-text
-            :accessibility-label :activity-message-body
-            :size                :paragraph-1}]
-          (map-indexed (fn [index {:keys [type literal destination]}]
-                         ^{:key index}
-                         (case type
-                           "mention" [quo/text
-                                      {:style style/mention-text
-                                       :size  :paragraph-1}
-                                      (str "@" (rf/sub [:messages/resolve-mention literal]))]
-                           "link"    destination
-                           literal))
-                       parsed-text-children))))
+  [{:keys [container parsed-text]}]
+  (into container (map parsed-text->hiccup) parsed-text))
+
+(defn- simple-message
+  [content]
+  (let [parsed-text (get-in content [:content :parsed-text 0 :children])]
+    [message-body
+     {:container   [quo/text
+                    {:number-of-lines     1
+                     :style               style/tag-text
+                     :accessibility-label :activity-message-body
+                     :size                :paragraph-1}]
+      :parsed-text parsed-text}]))
+
+(defn- album-message
+  [content]
+  (let [parsed-text (get-in content [0 :parsedText 0 :children])
+        images      (map :image content)]
+    [quo/activity-logs-photos
+     {:photos       images
+      :message-text [message-body
+                     {:container   [:<>]
+                      :parsed-text parsed-text}]}]))

 (defn- swipeable
  [{:keys [extra-fn]} child]
@@ -41,12 +61,12 @@

 (defn view
  [{:keys [notification extra-fn]}]
-  (let [{:keys [author chat-name community-id chat-id
-                message read timestamp]} notification
-        community-chat?                  (not (string/blank? community-id))
-        community-name                   (rf/sub [:communities/name community-id])
-        community-logo                   (rf/sub [:communities/logo community-id])
-        customization-color              (rf/sub [:profile/customization-color])]
+  (let [{:keys [author chat-name community-id chat-id message read timestamp
+                album-messages]} notification
+        community-chat?          (not (string/blank? community-id))
+        community-name           (rf/sub [:communities/name community-id])
+        community-logo           (rf/sub [:communities/logo community-id])
+        customization-color      (rf/sub [:profile/customization-color])]
    [swipeable {:extra-fn extra-fn}
     [gesture/touchable-without-feedback
      {:on-press (fn []
@@ -74,4 +94,6 @@
                                  :group-name chat-name
                                  :blur?      true
                                  :size       24}])]
-        :message             {:body (message-body message)}}]]]))
+        :message             {:body (if album-messages
+                                      [album-message album-messages]
+                                      [simple-message message])}}]]]))
@@ -24,35 +24,32 @@
    [utils.re-frame :as rf]))

 (defn notification-component
-  [{:keys [type] :as notification} index]
+  [{notification-type :type :as notification} index]
  (let [extra-fn (rn/use-callback
                  (fn []
                    {:notification notification})
                  [notification])
        props    {:notification notification
                  :extra-fn     extra-fn}]
-    ;; Notifications are expensive to render. Without `delay-render` the opening
-    ;; animation of the Activity Center can be clunky and the time to open the
-    ;; AC after pressing the bell icon can be high.
    [rn/view {:style (style/notification-container index)}
     (cond
-       (= type types/contact-verification)
+       (= notification-type types/contact-verification)
       [contact-verification/view props]

-       (= type types/contact-request)
+       (= notification-type types/contact-request)
       [contact-requests/view props]

-       (= type types/mention)
+       (= notification-type types/mention)
       [mentions/view props]

-       (= type types/reply)
+       (= notification-type types/reply)
       [reply/view props]

-       (= type types/admin)
+       (= notification-type types/admin)
       [admin/view props]

-       (some types/membership [type])
-       (condp = type
+       (types/membership notification-type)
+       (condp = notification-type
         types/private-group-chat [membership/view props]
         types/community-request  [community-request/view props]
         types/community-kicked   [community-kicked/view props]
@@ -70,10 +70,10 @@
      (when pass-through?
        [reanimated/blur-view (blur-overlay-params bottom-tabs-blur-overlay-style)])
      [rn/view {:style (style/bottom-tabs)}
-       [gesture/gesture-detector {:gesture communities-double-tab-gesture}
-        [bottom-tab :i/communities :communities-stack shared-values notifications-data]]
+       [bottom-tab :i/wallet :wallet-stack shared-values notifications-data]
       [gesture/gesture-detector {:gesture messages-double-tap-gesture}
        [bottom-tab :i/messages :chats-stack shared-values notifications-data]]
-       [bottom-tab :i/wallet :wallet-stack shared-values notifications-data]
+       [gesture/gesture-detector {:gesture communities-double-tab-gesture}
+        [bottom-tab :i/communities :communities-stack shared-values notifications-data]]
       (when config/show-not-implemented-features?
         [bottom-tab :i/browser :browser-stack shared-values notifications-data])]]]))
@@ -4,7 +4,7 @@
 (def ^:const switcher-card-size 160)
 (def ^:const floating-shell-button-height 44)

-(def ^:const default-selected-stack :communities-stack)
+(def ^:const default-selected-stack :wallet-stack)

 ;; Bottom tabs
 (def ^:const bottom-tabs-container-height-android 57)
@@ -6,9 +6,9 @@
            [status-im.common.scan-qr-code.view :as scan-qr-code]
            [status-im.common.validation.general :as validators]
            [status-im.contexts.communities.events]
-            [status-im.contexts.wallet.common.validation :as wallet-validation]
-            [status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
+            [status-im.contexts.wallet.wallet-connect.utils.uri :as wc-uri]
            [status-im.feature-flags :as ff]
+            [utils.address :as utils-address]
            [utils.debounce :as debounce]
            [utils.ethereum.eip.eip681 :as eip681]
            [utils.i18n :as i18n]
@@ -19,19 +19,15 @@
   :theme :dark
   :text  (i18n/label :t/invalid-qr)})

-(defn- text-for-url-path?
+(defn- text-a-status-url-for-path?
  [text path]
-  (some #(string/starts-with? text %) (router/path-urls path)))
+  (some #(string/starts-with? text %) (router/prepend-status-urls path)))

 (defn- extract-id
  [scanned-text]
  (let [index (string/index-of scanned-text "#")]
    (subs scanned-text (inc index))))

-(defn eth-address?
-  [scanned-text]
-  (wallet-validation/eth-address? scanned-text))
-
 (defn eip681-address?
  [scanned-text]
  (-> scanned-text
@@ -71,15 +67,15 @@
   [:wallet-connect/on-scan-connection scanned-text]
   300))

-(defn on-qr-code-scanned
+(defn- on-qr-code-scanned
  [scanned-text]
  (cond
    (or
-     (text-for-url-path? scanned-text router/community-with-data-path)
-     (text-for-url-path? scanned-text router/channel-path))
+     (text-a-status-url-for-path? scanned-text router/community-with-data-path)
+     (text-a-status-url-for-path? scanned-text router/channel-path))
    (debounce/debounce-and-dispatch [:universal-links/handle-url scanned-text] 300)

-    (text-for-url-path? scanned-text router/user-with-data-path)
+    (text-a-status-url-for-path? scanned-text router/user-with-data-path)
    (let [address (extract-id scanned-text)]
      (load-and-show-profile address))

@@ -87,9 +83,9 @@
        (validators/valid-compressed-key? scanned-text))
    (load-and-show-profile scanned-text)

-    (eth-address? scanned-text)
-    (do
-      (debounce/debounce-and-dispatch [:generic-scanner/scan-success scanned-text] 300)
+    (utils-address/supported-address? scanned-text)
+    (when-let [address (utils-address/supported-address->status-address scanned-text)]
+      (debounce/debounce-and-dispatch [:generic-scanner/scan-success address] 300)
      (debounce/debounce-and-dispatch [:navigate-change-tab :wallet-stack] 300))

    (eip681-address? scanned-text)
@@ -104,7 +100,7 @@
    nil

    (and
-     (wc-utils/valid-uri? scanned-text)
+     (wc-uri/valid-uri? scanned-text)
     (ff/enabled? ::ff/wallet.wallet-connect))
    (handle-wallet-connect scanned-text)

@@ -25,23 +25,29 @@
  []
  (rf/dispatch [:wallet/request-collectibles-for-current-viewing-account]))

-(defn view
-  [{:keys [selected-tab]}]
-  (let [collectible-list        (rf/sub
+(defn- collectibles-tab
+  []
+  (let [updating?               (rf/sub [:wallet/current-viewing-account-collectibles-updating?])
+        collectible-list        (rf/sub
                                 [:wallet/current-viewing-account-collectibles-in-selected-networks])
        current-account-address (rf/sub [:wallet/current-viewing-account-address])]
-    [rn/view {:style {:flex 1}}
-     (case selected-tab
-       :assets       [assets/view]
-       :collectibles [collectibles/view
-                      {:collectibles              collectible-list
-                       :current-account-address   current-account-address
-                       :on-end-reached            on-end-reached
-                       :on-collectible-press      on-collectible-press
-                       :on-collectible-long-press on-collectible-long-press}]
-       :activity     [activity/view]
-       :permissions  [empty-tab/view
-                      {:title        (i18n/label :t/no-permissions)
-                       :description  (i18n/label :t/no-collectibles-description)
-                       :placeholder? true}]
-       [about/view])]))
+    [collectibles/view
+     {:loading?                  updating?
+      :collectibles              collectible-list
+      :current-account-address   current-account-address
+      :on-end-reached            on-end-reached
+      :on-collectible-press      on-collectible-press
+      :on-collectible-long-press on-collectible-long-press}]))
+
+(defn view
+  [{:keys [selected-tab]}]
+  [rn/view {:style {:flex 1}}
+   (case selected-tab
+     :assets       [assets/view]
+     :collectibles [collectibles-tab]
+     :activity     [activity/view]
+     :permissions  [empty-tab/view
+                    {:title        (i18n/label :t/no-permissions)
+                     :description  (i18n/label :t/no-collectibles-description)
+                     :placeholder? true}]
+     [about/view])])
@@ -6,10 +6,10 @@
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.constants :as constants]
    [status-im.contexts.wallet.add-account.add-address-to-watch.style :as style]
    [status-im.contexts.wallet.common.validation :as validation]
    [status-im.subs.wallet.add-account.address-to-watch]
+    [utils.address :as utils-address]
    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -20,13 +20,9 @@
    (or (nil? user-input) (= user-input "")) nil
    (contains? known-addresses user-input)   (i18n/label :t/address-already-in-use)
    (not
-     (or (validation/eth-address? user-input)
+     (or (utils-address/supported-address? user-input)
         (validation/ens-name? user-input))) (i18n/label :t/invalid-address)))

-(defn- extract-address
-  [scanned-text]
-  (re-find constants/regx-address-contains scanned-text))
-
 (defn- address-input
  [{:keys [input-value validation-msg validate clear-input]}]
  (let [scanned-address (rf/sub [:wallet/scanned-address])
@@ -141,10 +137,12 @@
                                              (= activity-state :scanning)
                                              (not validated-address))
                     :on-press            (fn []
-                                            (rf/dispatch [:navigate-to
-                                                          :screen/wallet.confirm-address-to-watch
-                                                          {:address (extract-address
-                                                                     validated-address)}])
+                                            (rf/dispatch
+                                             [:navigate-to
+                                              :screen/wallet.confirm-address-to-watch
+                                              {:address
+                                               (utils-address/extract-address-without-chains-info
+                                                validated-address)}])
                                            (clear-input))
                     :container-style     {:z-index 2}}
                    (i18n/label :t/continue)]}
@@ -1,11 +1,15 @@
 (ns status-im.contexts.wallet.collectible.events
  (:require [camel-snake-kebab.extras :as cske]
+            [clojure.set]
            [clojure.string :as string]
            [react-native.platform :as platform]
            [status-im.contexts.network.data-store :as network.data-store]
            [status-im.contexts.wallet.collectible.utils :as collectible-utils]
+            [status-im.contexts.wallet.data-store :as data-store]
            [taoensso.timbre :as log]
+            [utils.collection]
            [utils.ethereum.chain :as chain]
+            [utils.number :as utils.number]
            [utils.re-frame :as rf]
            [utils.transforms :as transforms]))

@@ -24,6 +28,12 @@
 (def max-cache-age-seconds 3600)
 (def collectibles-request-batch-size 25)

+(def ownership-state
+  {:idle     1
+   :delayed  2
+   :updating 3
+   :error    4})
+
 (defn- move-collectibles-to-accounts
  [accounts new-collectibles-per-account]
  (reduce-kv (fn [acc account new-collectibles]
@@ -84,12 +94,18 @@
 (rf/reg-event-fx
 :wallet/request-collectibles-for-all-accounts
 (fn [{:keys [db]} [{:keys [new-request?]}]]
-   (let [accounts                 (->> (get-in db [:wallet :accounts])
+   (let [updating-addresses       (-> (get-in db [:wallet :ui :collectibles :updating])
+                                      keys
+                                      set)
+         accounts                 (->> (get-in db [:wallet :accounts])
                                       (filter (fn [[_ {:keys [has-more-collectibles?]}]]
                                                 (or (nil? has-more-collectibles?)
                                                     (true? has-more-collectibles?))))
                                       (keys))
-         num-accounts             (count accounts)
+         ;; filter the addresses which are requested before and the collectibles are updating
+         requestable-addresses    (clojure.set/difference (set accounts)
+                                                          updating-addresses)
+         num-accounts             (count requestable-addresses)
         collectibles-per-account (quot collectibles-request-batch-size num-accounts)
         ;; We need to pass unique IDs for simultaneous requests, otherwise they'll fail
         request-ids              (get-unique-collectible-request-id num-accounts)
@@ -100,13 +116,13 @@
                                            :account    account
                                            :amount     collectibles-per-account}]])
                                       request-ids
-                                       accounts)]
+                                       requestable-addresses)]
     {:db (cond-> db
            :always      (assoc-in [:wallet :ui :collectibles :pending-requests] num-accounts)
            new-request? (update-in [:wallet :accounts] update-vals #(dissoc % :collectibles)))
      :fx collectible-requests})))

-(defn request-new-collectibles-for-account-from-signal
+(defn request-collectibles-for-account
  [{:keys [db]} [address]]
  (let [pending-requests (get-in db [:wallet :ui :collectibles :pending-requests] 0)
        [request-id]     (get-unique-collectible-request-id 1)]
@@ -117,49 +133,138 @@
             :account    address
             :amount     collectibles-request-batch-size}]]]}))

-(rf/reg-event-fx :wallet/request-new-collectibles-for-account-from-signal
- request-new-collectibles-for-account-from-signal)
+(rf/reg-event-fx :wallet/request-collectibles-for-account request-collectibles-for-account)

 (rf/reg-event-fx
 :wallet/request-collectibles-for-current-viewing-account
 (fn [{:keys [db]} _]
   (when (network.data-store/online? db)
-     (let [current-viewing-account (-> db :wallet :current-viewing-account-address)
-           [request-id]            (get-unique-collectible-request-id 1)]
-       {:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
-        :fx [[:dispatch
-              [:wallet/request-new-collectibles-for-account
-               {:request-id request-id
-                :account    current-viewing-account
-                :amount     collectibles-request-batch-size}]]]}))))
+     (let [current-viewing-account (-> db :wallet :current-viewing-account-address)]
+       {:fx [[:dispatch [:wallet/request-collectibles-for-account current-viewing-account]]]}))))
+
+(rf/reg-event-fx
+ :wallet/collectible-ownership-update-finished-with-error
+ (fn [{:keys [db]} [{:keys [accounts message chainId]}]]
+   (let [address            (first accounts)
+         pending-chain-ids  (get-in db [:wallet :ui :collectibles :updating address])
+         updated-chain-ids  (disj pending-chain-ids chainId)
+         all-chain-updated? (and (some? pending-chain-ids) (empty? updated-chain-ids))]
+     {:db (cond-> db
+            (some? pending-chain-ids)
+            (assoc-in [:wallet :ui :collectibles :updating address] updated-chain-ids))
+      :fx [[:dispatch
+            [:wallet/log-rpc-error
+             {:event  :wallet/collectible-ownership-update-finished-with-error
+              :params {:address  address
+                       :chain-id chainId}}
+             message]]
+           (when all-chain-updated?
+             [:dispatch [:wallet/request-collectibles-for-account address]])]})))
+
+(rf/reg-event-fx
+ :wallet/collectible-ownership-update-finished
+ (fn [{:keys [db]} [{:keys [accounts chainId]}]]
+   (let [address            (first accounts)
+         pending-chain-ids  (get-in db [:wallet :ui :collectibles :updating address])
+         updated-chain-ids  (disj pending-chain-ids chainId)
+         all-chain-updated? (and (some? pending-chain-ids) (empty? updated-chain-ids))]
+     {:db (cond-> db
+            (some? pending-chain-ids)
+            (assoc-in [:wallet :ui :collectibles :updating address] updated-chain-ids))
+      :fx [(when all-chain-updated?
+             [:dispatch [:wallet/request-collectibles-for-account address]])]})))
+
+(defn- update-collectibles-in-account
+  [existing-collectibles updated-collectibles]
+  (let [indexed-existing (utils.collection/index-by
+                          :unique-id
+                          existing-collectibles)
+        existing-ids     (-> indexed-existing keys vec)
+        ;; pick collectibles only in the app-db
+        indexed-updated  (-> (utils.collection/index-by
+                              :unique-id
+                              updated-collectibles)
+                             (select-keys existing-ids))]
+    (-> (merge-with
+         merge
+         indexed-existing
+         indexed-updated)
+        vals
+        vec)))
+
+(rf/reg-event-fx
+ :wallet/collectibles-data-updated
+ (fn [{:keys [db]} [{:keys [message]}]]
+   (let [collectibles-by-address (->> message
+                                      transforms/json->clj
+                                      data-store/rpc->collectibles
+                                      (group-by #(-> % :ownership first :address)))]
+     {:db (update-in db
+                     [:wallet :accounts]
+                     #(reduce-kv
+                       (fn [accounts address updated-collectibles]
+                         (if (contains? accounts address)
+                           (update-in accounts
+                                      [address :collectibles]
+                                      update-collectibles-in-account
+                                      updated-collectibles)
+                           accounts))
+                       %
+                       collectibles-by-address))})))
+
+(rf/reg-event-fx
+ :wallet/set-collectibles-updating-status
+ (fn [{:keys [db]} [address chain-ids]]
+   {:db (assoc-in db [:wallet :ui :collectibles :updating address] chain-ids)}))

 (defn- update-fetched-collectibles-progress
  [db owner-address collectibles offset has-more?]
  (-> db
+      (update-in [:wallet :ui :collectibles :updating] dissoc owner-address)
      (assoc-in [:wallet :ui :collectibles :fetched owner-address] collectibles)
      (assoc-in [:wallet :accounts owner-address :current-collectible-idx]
                (+ offset (count collectibles)))
      (assoc-in [:wallet :accounts owner-address :has-more-collectibles?] has-more?)))

+(defn- updating-collectibles?
+  [status]
+  (and (= (:state status) (ownership-state :updating))
+       (= (:timestamp status) -1)))
+
 (rf/reg-event-fx
 :wallet/owned-collectibles-filtering-done
 (fn [{:keys [db]} [{:keys [message]}]]
   (let [{:keys [offset ownershipStatus collectibles
-                 hasMore]} (transforms/json->clj message)
-         collectibles      (cske/transform-keys transforms/->kebab-case-keyword collectibles)
-         pending-requests  (dec (get-in db [:wallet :ui :collectibles :pending-requests]))
-         owner-address     (some->> ownershipStatus
-                                    first
-                                    key
-                                    name)]
+                 hasMore]}           (transforms/json->clj message)
+         ownership-status-by-address (-> ownershipStatus
+                                         (update-keys name)
+                                         (update-vals #(update-keys %
+                                                                    (comp utils.number/parse-int name))))
+         owner-address               (some-> ownership-status-by-address
+                                             first
+                                             key)
+         ownership-status            (get ownership-status-by-address owner-address)
+         collectibles                (data-store/rpc->collectibles collectibles)
+         pending-requests            (dec (get-in db [:wallet :ui :collectibles :pending-requests]))
+         ;; check if collectibles are updating (never fetched and cached before) for this address
+         updating-chains             (-> (select-keys
+                                          ownership-status
+                                          (for [[k v] ownership-status
+                                                :when (updating-collectibles? v)]
+                                            k))
+                                         keys
+                                         set)
+         updating?                   (-> updating-chains count pos?)]
     {:db (cond-> db
            :always       (assoc-in [:wallet :ui :collectibles :pending-requests] pending-requests)
            owner-address (update-fetched-collectibles-progress owner-address
                                                                collectibles
                                                                offset
-                                                                hasMore))
+                                                                (when-not updating? hasMore)))
      :fx [(when (zero? pending-requests)
-             [:dispatch [:wallet/flush-collectibles-fetched]])]})))
+             [:dispatch [:wallet/flush-collectibles-fetched]])
+           (when updating?
+             [:dispatch [:wallet/set-collectibles-updating-status owner-address updating-chains]])]})))

 (rf/reg-event-fx
 :wallet/navigate-to-collectible-details
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
frank	f9fdd5c671	fix_: random empty account	2024-09-11 19:31:03 +08:00
John Ngei	462101dbf5	chore: Compress syncing images (#20907 )	2024-09-10 20:06:46 -03:00
Parvesh Monu	00f1463e94	Change order of bottom tabs and select wallet-stack as default tab (#21240 ) * Changed order of bottom tabs * Changed default bottom to wallet-stack	2024-09-10 19:41:34 +05:30
Lungu CristianandMohsen	9135e915ab	Restructure wallet-connect namespaces (#21167 ) Co-authored-by: Mohsen <maxghafori@gmail.com>	2024-09-10 15:59:18 +03:00
John NgeiandUlises M	d7242f1c70	fix(chats): Last message overlapped by the composer when a message is pinned (#20606 ) * fixed overlapping last message by the composer when there is a pinned message * prevent a user who is not a member of a community from pinning or unpinning channel messages --------- Co-authored-by: Ulises M <ulises.ssb@hotmail.com>	2024-09-09 17:19:10 -06:00
Ulises Manuel	fa4ea0640d	fix(onboarding): Can't create profile (#21170 ) * Remove unnecessary React.Fragment and reagent functional components notation * Fix continue button not responding in the Create Profile screen	2024-09-09 14:43:36 -06:00
Ulises Manuel	8f94332d59	feat(wallet): Hide account switcher in send flow (#20892 ) * Fix input amount step skipped while sending a token * Rename events to remove the `wallet` unnecessary suffix * Code style fixes * Fix React warnings: 1. About unique key in `select-address.tabs.view` along with a refactor 2. The deprecated `:keyboard-should-persist-taps` as `true` in `send.select-address.view` * Hide account switcher while sending a collectible * Fix tests	2024-09-09 14:24:00 -06:00
Brian Sztamfater	337ec963b7	feat: autorefresh swap proposal (#21143 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-09-09 01:27:31 -03:00
Ulises Manuel	cf5a395b29	feat(wallet): Show collectibles in activity tab (#21109 ) * Add UNKNOWN collectible variant for context tags * Show fallbacks for collectibles in the activity tab	2024-09-06 15:44:12 -06:00
Brian Sztamfater	e2d597401c	feat(swap): trigger swap transactions (#21134 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-09-06 11:30:15 -03:00
Mohsen	3ae500ff68	[#20909 ] fix: dapp wrong network refusal (#21123 )	2024-09-06 15:56:04 +03:00
Parvesh Monu	779eadd787	Update Sign in flow on Profiles list screen (#21160 )	2024-09-06 15:46:15 +05:30
Siddarth Kumar	110475a973	fixes for building universal APK (#21175 ) In my previous PR -> https://github.com/status-im/status-mobile/pull/21163 I had attempted to build universalAPK only for release builds but had missed out on these changes. This commit ensures `universalApk` value of `gradle` config is properly set. This commit also points to my branch in `status-jenkins-lib` which modifies the APK size restrictions. Its not `110 MB` for Universal APKs and `70 MB` for Individual Architecture APKs	2024-09-05 14:31:03 +05:30
Ulises Manuel	74469c2b61	feat(Activity Center): Add support for preview images in chat mentions (#21150 ) * fix `clojure.core/type` shadowed * Remove comment about rn/delay-render	2024-09-04 12:25:14 -06:00
Brian Sztamfater	d5238ac82f	feat: approve token transactions on swap (#21076 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-09-04 13:53:45 -03:00
Brian Sztamfater	c861d95d69	feat(swap): fetch swap proposals (#21040 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-09-04 13:40:06 -03:00
Volodymyr Kozieiev	40f98f8238	token input refactoring (#21136 )	2024-09-04 13:05:19 +01:00
Tetiana Churikova	2161c2e433	gh: change template (#21146 )	2024-09-04 11:22:08 +02:00
Siddarth Kumar	2983af67d6	ci: build universal apk for release (#21163 ) This commit points to status-jenkins-lib tag which ensures that universal APKs are built for release.	2024-09-03 18:45:35 +05:30
Mohsen	4a8bb704bf	[#20150 ] feat: wallet connect pairing via deep links (#21050 ) * [#20150] feat: wallet connect pairing via deep links * [#20150] feat: redirect to the dapp after finish response * [#20150] test: add tests for events and utils * [#20150] fix: reviewer's feedback	2024-09-03 10:52:17 +03:00
Sean Hagstrom	e61702c8bb	chore: skip audio-player component test for playing audio-message (#21098 ) This change skips the test-suite for the audio player since the tests seem fail/pass inconsistently because of some flakiness.	2024-09-03 08:34:00 +01:00
Sean Hagstrom	5b75e1dca6	fix: calendar component specs to avoid duplicate day entries (#21164 ) This change attempts to fix the calendar component specs to avoid errors with finding multiple elements with the same text. Prior to this change it was possible for multiple elements to be found with the same number of the day, like "5", which caused the tests helpers to thrown an exception. Now the specs will use a different test helper to avoid the exceptions, and we've adjusted the test data to avoid duplicate day numbers too.	2024-09-03 07:16:11 +01:00
Mohamed Javid	97d4edcf30	fix(wallet): Collectibles not fetched for new and recovered accounts (#20961 ) This commit fixes collectibles not fetched for new and recovered accounts until the user re-login. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-08-31 01:18:00 +05:30
Mohamed Javid	1663848b7e	fix_: Profile with ENS fixes (#21003 ) This commit: - fixes profile with ENS can edit their name - fixes identicon ring is shown for the profile with ENS - updates the profile URL for the profile with ENS Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-08-30 20:25:02 +05:30
Mohsen	113f9aaa81	[#20803 ] fix: dapp session proposal reject (#21121 )	2024-08-30 16:54:18 +03:00
Parvesh Monu	6db24a4a6c	Improve and Fix Unmute Behavior for Chats and Communities (#21052 ) https://github.com/status-im/status-go/compare/83aa01c7...9e722ed0	2024-08-30 18:09:54 +05:30
frank	8cac0e46b1	chore_: Add suggestion limit for mention recommendations (#21131 ) https://github.com/status-im/status-go/compare/cba3ac57...82ba10ed	2024-08-30 11:14:37 +08:00
flexsurfer	b38d2c1836	Admin cannot re-add users to the group chat after removing them using the "Manage members" option. #20959 (#21082 ) Incorrect text for system message when removing a User from a group chat #21053	2024-08-29 21:19:17 +02:00
flexsurfer	8948904a9b	Unblocked user is added to the contact list #20954 (#21046 )	2024-08-29 21:18:45 +02:00
Siddarth Kumar	8111758ef7	chore: bump blur view lib to 4.4.1 (#21147 ) This commit upgrades react-native-blur view to 4.4.1 which includes my fix for incorrect sha being found randomly.	2024-08-29 21:13:40 +05:30
Volodymyr Kozieiev	bf7b86ccd5	Metamask address support (#20844 ) * wip, small renamings * Added metamask regex * Added tests for metamask conversion * Add metamask address to shell scanner and wallet address scanner * unify address functions usage * address-related functions moved to a dedicated namespace * minor fixes * fix lint and tests * review notes fixes * return back function * lint fix * Support metamask addresses without suffix, prefixed `:ethereum`	2024-08-29 15:48:41 +01:00
Mohsen	96b88a427d	[#20720 ] feat: add ability to set currency from account Settings (#20772 ) * [#20720] feat: add ability to set currency from account Settings	2024-08-29 14:32:55 +03:00
Volodymyr Kozieiev	cc6dcc3636	Fix rounding of fiat and crypto on send page (#20915 ) * Fix conversion rounding on send page * fixing review notes * fix amount of allowed input decimals for crypto	2024-08-28 13:38:48 +01:00
Mohamed Javid	9d6b8609be	fix(ios)_: Blank screen on pages with input focused when navigating back (#21100 ) This commit fixes the blank screen shown on pages with inputs focused when navigating back to that screen. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-08-28 17:28:45 +05:30
Mohamed Javid	16ab8f9357	chore_: Remove passing emoji on profile creation (#21002 ) This commit removes passing random emoji on account creation for the default wallet account, as status-go will set this. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-08-28 17:03:02 +05:30