Improvements

cleanups
Show a menu of operations for a saved address
2024-04-24 15:32:21 +02:00 · 2024-04-24 15:32:21 +02:00 · 2024-04-24 15:32:20 +02:00 · 2024-04-24 15:05:53 +02:00 · 2024-04-24 11:55:40 +02:00 · 2024-04-24 11:35:03 +02:00
112 changed files with 2431 additions and 1355 deletions
@@ -2,6 +2,13 @@
          xmlns:tools="http://schemas.android.com/tools"
          android:installLocation="auto">

+    <queries>
+        <intent>
+            <action android:name="android.intent.action.SEND_MULTIPLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
    <!-- non-dangerous permissions -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
@@ -893,8 +893,6 @@ PODS:
    - React
  - react-native-lottie-splash-screen (1.1.2):
    - React
-  - react-native-mail (6.1.1):
-    - React-Core
  - react-native-netinfo (4.7.0):
    - React
  - react-native-orientation-locker (1.5.0):
@@ -1186,7 +1184,6 @@ DEPENDENCIES:
  - react-native-hole-view (from `../node_modules/react-native-hole-view`)
  - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
  - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
-  - react-native-mail (from `../node_modules/react-native-mail`)
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
  - react-native-shake (from `../node_modules/react-native-shake`)
@@ -1323,8 +1320,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-image-resizer"
  react-native-lottie-splash-screen:
    :path: "../node_modules/react-native-lottie-splash-screen"
-  react-native-mail:
-    :path: "../node_modules/react-native-mail"
  react-native-netinfo:
    :path: "../node_modules/@react-native-community/netinfo"
  react-native-orientation-locker:
@@ -1472,7 +1467,6 @@ SPEC CHECKSUMS:
  react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
  react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
  react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
-  react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
@@ -11,7 +11,6 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
-		2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */; };
 		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 */; };
 		3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
@@ -36,7 +35,7 @@
 		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 */; };
-		42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */; };
+		4A976A097386605EB7E85E28 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 804FB5E6B0FBBDB034E6CD09 /* 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 */; };
@@ -46,11 +45,11 @@
 		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 */; };
-		8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.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 */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
+		C0BA109CA441C3DB93714F1D /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */; };
 		C14C5F8D29C0A149005C58A7 /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C14C5F9129C0AD9C005C58A7 /* launch-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */; };
 		C14C5F9329C0ADB5005C58A7 /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
@@ -58,6 +57,7 @@
 		C1715FFB29C0BCE50088FA8B /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
+		D0B4A2EA5E72EDB67CE6DA66 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */; };
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		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 */; };
@@ -108,36 +108,34 @@
 		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>"; };
-		0C331FD392B615DDAD0997F5 /* 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>"; };
 		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>"; };
-		2756A97EBFF084FA94990AA5 /* 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>"; };
-		2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
-		466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3DE83268BA3216610DFF6337 /* 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>"; };
 		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; };
-		5AAC8D9B1AF8BB7C8AB89845 /* 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>"; };
 		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>"; };
-		680C14B0F642A5F544C397B7 /* 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>"; };
 		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>"; };
 		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>"; };
-		7FA4F04CE45319370F87C4FD /* 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>"; };
-		87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		78655BCD07318E9885F5214B /* 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>"; };
+		804FB5E6B0FBBDB034E6CD09 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		857B0CA5528DF4E460CECF05 /* 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>"; };
+		870C29BCADFAAEC7F7C0ADD0 /* 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>"; };
 		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; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
+		94F1B9FD13C8504F50E31C94 /* 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>"; };
 		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>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
 		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>"; };
@@ -147,13 +145,15 @@
 		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>"; };
+		B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
-		D42A8AC52E48DA4C89F20C13 /* 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>"; };
+		D272F46F39D037EC0EAB65C8 /* 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>"; };
+		EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				4A976A097386605EB7E85E28 /* 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 */,
-				42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */,
+				C0BA109CA441C3DB93714F1D /* 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 */,
-				2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */,
+				D0B4A2EA5E72EDB67CE6DA66 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */,
-				466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */,
-				87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */,
+				EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */,
+				804FB5E6B0FBBDB034E6CD09 /* libPods-Status-StatusIm-StatusImTests.a */,
+				B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */,
-				7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */,
-				D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */,
-				0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */,
+				857B0CA5528DF4E460CECF05 /* Pods-Status-StatusIm.debug.xcconfig */,
+				78655BCD07318E9885F5214B /* Pods-Status-StatusIm.release.xcconfig */,
+				870C29BCADFAAEC7F7C0ADD0 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				94F1B9FD13C8504F50E31C94 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				3DE83268BA3216610DFF6337 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				D272F46F39D037EC0EAB65C8 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */,
+				53D1210C251AB35BB66F64D1 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				835B3E5945D5F723935FD4E1 /* [CP] Copy Pods Resources */,
+				2E8578589647F2D1AB7D69B0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */,
+				0792D7C164832E59371E617A /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				5BEC29A10D63DFF8AFF5B788 /* [CP] Copy Pods Resources */,
+				70A851EF00039276F55A4FB3 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */,
+				16ECB1DEB0091DFC0F3DED3C /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */,
+				C15E3DDA7B1E1CB5EDF76A1E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,7 +544,7 @@
 			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";
 		};
-		140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */ = {
+		0792D7C164832E59371E617A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -566,6 +566,52 @@
 			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;
 		};
+		16ECB1DEB0091DFC0F3DED3C /* [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-StatusImPR-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;
+		};
+		2E8578589647F2D1AB7D69B0 /* [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;
+		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -594,7 +640,29 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
-		5BEC29A10D63DFF8AFF5B788 /* [CP] Copy Pods Resources */ = {
+		53D1210C251AB35BB66F64D1 /* [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;
+		};
+		70A851EF00039276F55A4FB3 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -618,7 +686,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */ = {
+		C15E3DDA7B1E1CB5EDF76A1E /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -642,74 +710,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		78F85303177A5D4820A08DC1 /* [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-StatusImPR-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;
-		};
-		835B3E5945D5F723935FD4E1 /* [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;
-		};
-		99EA576680D5849CA4274106 /* [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;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -771,7 +771,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 870C29BCADFAAEC7F7C0ADD0 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -808,7 +808,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 94F1B9FD13C8504F50E31C94 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -841,7 +841,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 857B0CA5528DF4E460CECF05 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -923,7 +923,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 78655BCD07318E9885F5214B /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -998,7 +998,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 3DE83268BA3216610DFF6337 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1078,7 +1078,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = D272F46F39D037EC0EAB65C8 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -0,0 +1,133 @@
+package im.status.ethereum.module
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Callback
+import android.util.Log
+import android.content.Intent
+import android.net.Uri
+import android.content.pm.PackageManager
+import java.io.File
+import androidx.core.content.FileProvider
+import android.text.Html
+
+class MailManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "MailManager"
+
+        @ReactMethod
+        fun mail(options: ReadableMap, callback: Callback) {
+            Log.d(TAG, "attempting to send email")
+            val i = Intent(Intent.ACTION_SEND_MULTIPLE)
+            val selectorIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
+            i.selector = selectorIntent
+
+            if (options.hasKey("subject") && !options.isNull("subject")) {
+                i.putExtra(Intent.EXTRA_SUBJECT, options.getString("subject"))
+            }
+
+            if (options.hasKey("body") && !options.isNull("body")) {
+                val body = options.getString("body")
+                if (options.hasKey("isHTML") && options.getBoolean("isHTML")) {
+                    i.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body))
+                } else {
+                    i.putExtra(Intent.EXTRA_TEXT, body)
+                }
+            }
+
+            if (options.hasKey("recipients") && !options.isNull("recipients")) {
+                val recipients = options.getArray("recipients")
+                i.putExtra(Intent.EXTRA_EMAIL, this.utils.readableArrayToStringArray(recipients!!))
+            }
+
+            if (options.hasKey("ccRecipients") && !options.isNull("ccRecipients")) {
+                val ccRecipients = options.getArray("ccRecipients")
+                i.putExtra(Intent.EXTRA_CC, this.utils.readableArrayToStringArray(ccRecipients!!))
+            }
+
+            if (options.hasKey("bccRecipients") && !options.isNull("bccRecipients")) {
+                val bccRecipients = options.getArray("bccRecipients")
+                i.putExtra(Intent.EXTRA_BCC, this.utils.readableArrayToStringArray(bccRecipients!!))
+            }
+
+            if (options.hasKey("attachments") && !options.isNull("attachments")) {
+                val r = options.getArray("attachments")
+                val length = r?.size() ?: 0
+
+                val provider = reactContext.applicationContext.packageName + ".rnmail.provider"
+                val resolvedIntentActivities = reactContext.packageManager.queryIntentActivities(i,
+                        PackageManager.MATCH_DEFAULT_ONLY)
+
+                val uris = ArrayList<Uri>()
+                for (keyIndex in 0 until length) {
+                    val clip = r?.getMap(keyIndex)
+                    val uri: Uri
+                    if (clip?.hasKey("path") == true && !clip.isNull("path")) {
+                        val path = clip.getString("path")
+                        val file = File(path)
+                        uri = FileProvider.getUriForFile(reactContext, provider, file)
+                    } else if (clip?.hasKey("uri") == true && !clip.isNull("uri")) {
+                        val uriPath = clip.getString("uri")
+                        uri = Uri.parse(uriPath)
+                    } else {
+                        callback.invoke("not_found")
+                        return
+                    }
+                    uris.add(uri)
+
+                    for (resolvedIntentInfo in resolvedIntentActivities) {
+                        val packageName = resolvedIntentInfo.activityInfo.packageName
+                        reactContext.grantUriPermission(packageName, uri,
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    }
+                }
+
+                i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                i.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
+            }
+
+            val manager = reactContext.packageManager
+            val list = manager.queryIntentActivities(i, 0)
+
+            if (list == null || list.isEmpty()) {
+                Log.d(TAG, "not_available")
+                callback.invoke("not_available")
+                return
+            }
+
+            if (list.size == 1) {
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try {
+                    reactContext.startActivity(i)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            } else {
+                var chooserTitle = "Send Mail"
+
+                if (options.hasKey("customChooserTitle") && !options.isNull("customChooserTitle")) {
+                    chooserTitle = options.getString("customChooserTitle") ?: ""
+                }
+
+                val chooser = Intent.createChooser(i, chooserTitle)
+                chooser.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+
+                try {
+                    reactContext.startActivity(chooser)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            }
+        }
+
+    companion object {
+        private const val TAG = "MailManager"
+    }
+
+}
@@ -74,4 +74,5 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
    fun recover(rpcParams: String, callback: Callback) {
        utils.executeRunnableStatusGoMethod({ Statusgo.recover(rpcParams) }, callback)
    }
+
 }
@@ -43,7 +43,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
    }

    override fun handleSignal(jsonEventString: String) {
-        Log.d(TAG, "Signal event")
        val params = Arguments.createMap()
        params.putString("jsonEvent", jsonEventString)
        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)
@@ -24,6 +24,7 @@ class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {
            add(LogManager(reactContext))
            add(Utils(reactContext))
            add(NetworkManager(reactContext))
+            add(MailManager(reactContext))
            add(RNSelectableTextInputModule(reactContext))
        }

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableArray;
 import android.util.Log
 import org.json.JSONException
 import org.json.JSONObject
@@ -141,4 +142,15 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
    fun toChecksumAddress(address: String): String {
        return Statusgo.toChecksumAddress(address)
    }
+
+    fun readableArrayToStringArray(r: ReadableArray): Array<String> {
+        val length = r.size()
+        val strArray = Array(length) { "" }
+
+        for (keyIndex in 0 until length) {
+            strArray[keyIndex] = r.getString(keyIndex) ?: ""
+        }
+
+        return strArray
+    }
 }
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="rnmail_dl" path="Download/" />
+    <cache-path name="rnmail_cache" path="/" />
+    <root-path name="rnmail_sdcard" path="." />
+</paths>
@@ -0,0 +1,9 @@
+#import <sys/utsname.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <React/RCTBridgeModule.h>
+#import "RCTLog.h"
+
+@interface MailManager : NSObject <RCTBridgeModule, MFMailComposeViewControllerDelegate>
+
+@end
@@ -0,0 +1,207 @@
+#import <MessageUI/MessageUI.h>
+#import "MailManager.h"
+#import <React/RCTConvert.h>
+#import <React/RCTLog.h>
+#import "React/RCTBridge.h"
+#import "React/RCTEventDispatcher.h"
+
+@implementation MailManager
+{
+    NSMutableDictionary *_callbacks;
+}
+
+- (instancetype)init
+{
+    if ((self = [super init])) {
+        _callbacks = [[NSMutableDictionary alloc] init];
+    }
+    return self;
+}
+
+- (dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
+
+ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(mail:(NSDictionary *)options
+                  callback: (RCTResponseSenderBlock)callback)
+{
+    if ([MFMailComposeViewController canSendMail])
+    {
+        MFMailComposeViewController *mail = [[MFMailComposeViewController alloc] init];
+        mail.mailComposeDelegate = self;
+        _callbacks[RCTKeyForInstance(mail)] = callback;
+
+        if (options[@"subject"]){
+            NSString *subject = [RCTConvert NSString:options[@"subject"]];
+            [mail setSubject:subject];
+        }
+
+        BOOL isHTML = NO;
+
+        if (options[@"isHTML"]){
+            isHTML = [options[@"isHTML"] boolValue];
+        }
+
+        if (options[@"body"]){
+            NSString *body = [RCTConvert NSString:options[@"body"]];
+            [mail setMessageBody:body isHTML:isHTML];
+        }
+
+        if (options[@"recipients"]){
+            NSArray *recipients = [RCTConvert NSArray:options[@"recipients"]];
+            [mail setToRecipients:recipients];
+        }
+
+        if (options[@"ccRecipients"]){
+            NSArray *ccRecipients = [RCTConvert NSArray:options[@"ccRecipients"]];
+            [mail setCcRecipients:ccRecipients];
+        }
+
+        if (options[@"bccRecipients"]){
+            NSArray *bccRecipients = [RCTConvert NSArray:options[@"bccRecipients"]];
+            [mail setBccRecipients:bccRecipients];
+        }
+        if (options[@"attachments"]) {
+            NSArray *attachments = [RCTConvert NSArray:options[@"attachments"]];
+            for (NSDictionary *attachment in attachments) {
+                if ((attachment[@"path"] || attachment[@"uri"]) && (attachment[@"type"] || attachment[@"mimeType"])) {
+                    NSString *attachmentPath = [RCTConvert NSString:attachment[@"path"]];
+                    NSString *attachmentUri = [RCTConvert NSString:attachment[@"uri"]];
+                    NSString *attachmentType = [RCTConvert NSString:attachment[@"type"]];
+                    NSString *attachmentName = [RCTConvert NSString:attachment[@"name"]];
+                    NSString *attachmentMimeType = [RCTConvert NSString:attachment[@"mimeType"]];
+
+                    // Set default filename if not specificed
+                    if (!attachmentName) {
+                        attachmentName = [[attachmentPath lastPathComponent] stringByDeletingPathExtension];
+                    }
+
+                    NSData *fileData;
+                    if (attachmentPath) {
+                        NSFileManager *fileManager = [NSFileManager defaultManager];
+                        if (![fileManager fileExistsAtPath:attachmentPath]){
+                            callback(@[[NSString stringWithFormat: @"attachment file with path '%@' does not exist", attachmentPath]]);
+                            return;
+                        }
+                        // Get the resource path and read the file using NSData
+                        fileData = [NSData dataWithContentsOfFile:attachmentPath];
+                    } else if (attachmentUri) {
+                        // Get the URI and read it using NSData
+                        NSURL *attachmentURL = [[NSURLComponents componentsWithString:attachmentUri] URL];
+                        NSError *error = nil;
+                        fileData = [NSData dataWithContentsOfURL:attachmentURL options:0 error:&error];
+                        if (!fileData) {
+                            callback(@[[NSString stringWithFormat: @"attachment file with uri '%@' does not exist", attachmentUri]]);
+                            return;
+                        }
+                    }
+
+                    // Determine the MIME type
+                    NSString *mimeType;
+                    if (attachmentType) {
+                        /*
+                         * Add additional mime types and PR if necessary. Find the list
+                         * of supported formats at http://www.iana.org/assignments/media-types/media-types.xhtml
+                         */
+                        NSDictionary *supportedMimeTypes = @{
+                            @"jpeg" : @"image/jpeg",
+                            @"jpg" : @"image/jpeg",
+                            @"png" : @"image/png",
+                            @"doc" : @"application/msword",
+                            @"docx" : @"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                            @"ppt" : @"application/vnd.ms-powerpoint",
+                            @"pptx" : @"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+                            @"html" : @"text/html",
+                            @"csv" : @"text/csv",
+                            @"pdf" : @"application/pdf",
+                            @"vcard" : @"text/vcard",
+                            @"json" : @"application/json",
+                            @"zip" : @"application/zip",
+                            @"text" : @"text/*",
+                            @"mp3" : @"audio/mpeg",
+                            @"wav" : @"audio/wav",
+                            @"aiff" : @"audio/aiff",
+                            @"flac" : @"audio/flac",
+                            @"ogg" : @"audio/ogg",
+                            @"xls" : @"application/vnd.ms-excel",
+                            @"ics" : @"text/calendar",
+                            @"xlsx" : @"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                        };
+                        if([supportedMimeTypes objectForKey:attachmentType]) {
+                            mimeType = [supportedMimeTypes objectForKey:attachmentType];
+                        } else {
+                            callback(@[[NSString stringWithFormat: @"Mime type '%@' for attachment is not handled", attachmentType]]);
+                            return;
+                        }
+                    } else if (attachmentMimeType) {
+                        mimeType = attachmentMimeType;
+                    }
+
+                    // Add attachment
+                    [mail addAttachmentData:fileData mimeType:mimeType fileName:attachmentName];
+                }
+            }
+        }
+
+        UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+
+        while (root.presentedViewController) {
+            root = root.presentedViewController;
+        }
+        [root presentViewController:mail animated:YES completion:nil];
+    } else {
+        callback(@[@"not_available"]);
+    }
+}
+
+#pragma mark MFMailComposeViewControllerDelegate Methods
+
+- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error
+{
+    NSString *key = RCTKeyForInstance(controller);
+    RCTResponseSenderBlock callback = _callbacks[key];
+    if (callback) {
+        switch (result) {
+            case MFMailComposeResultSent:
+                callback(@[[NSNull null] , @"sent"]);
+                break;
+            case MFMailComposeResultSaved:
+                callback(@[[NSNull null] , @"saved"]);
+                break;
+            case MFMailComposeResultCancelled:
+                callback(@[[NSNull null] , @"cancelled"]);
+                break;
+            case MFMailComposeResultFailed:
+                callback(@[@"failed"]);
+                break;
+            default:
+                callback(@[@"error"]);
+                break;
+        }
+        [_callbacks removeObjectForKey:key];
+    } else {
+        RCTLogWarn(@"No callback registered for mail: %@", controller.title);
+    }
+    UIViewController *ctrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+    while (ctrl.presentedViewController && ctrl != controller) {
+        ctrl = ctrl.presentedViewController;
+    }
+    [ctrl dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark Private
+
+static NSString *RCTKeyForInstance(id instance)
+{
+    return [NSString stringWithFormat:@"%p", instance];
+}
+
+@end
@@ -38,9 +38,6 @@ static RCTBridge *bridge;
        return;
    }

-#if DEBUG
-    NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal);
-#endif
    [bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
                                            body:@{@"jsonEvent": signal}];

@@ -12,6 +12,7 @@
 		CE4E31B11D86951A0033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B01D86951A0033ED64 /* Statusgo.xcframework */; };
 		E92244EB2B485F2400915F4C /* UIHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E92244E92B485F2400915F4C /* UIHelper.m */; };
 		E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = E967A3AB2B47BD5A00FB19B2 /* Utils.m */; };
+		E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */; };
 		E9BEF3602B470BF1001F6755 /* NetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9BEF35E2B470BF1001F6755 /* NetworkManager.m */; };
 		E9C33AA62B4828A60074B1C5 /* DatabaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */; };
 		E9DB08932B4858B400F51053 /* LogManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9DB08912B4858B400F51053 /* LogManager.m */; };
@@ -42,6 +43,8 @@
 		E92244EA2B485F2400915F4C /* UIHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHelper.h; sourceTree = "<group>"; };
 		E967A3AA2B47BD5A00FB19B2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		E967A3AB2B47BD5A00FB19B2 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
+		E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MailManager.h; sourceTree = "<group>"; };
+		E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MailManager.m; sourceTree = "<group>"; };
 		E9BEF35E2B470BF1001F6755 /* NetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkManager.m; sourceTree = "<group>"; };
 		E9BEF35F2B470BF1001F6755 /* NetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkManager.h; sourceTree = "<group>"; };
 		E9C33AA42B4828A60074B1C5 /* DatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseManager.h; sourceTree = "<group>"; };
@@ -86,6 +89,8 @@
 		206C9F3C1D474E910063E3E6 /* Status */ = {
 			isa = PBXGroup;
 			children = (
+				E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */,
+				E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */,
 				E92244EA2B485F2400915F4C /* UIHelper.h */,
 				E92244E92B485F2400915F4C /* UIHelper.m */,
 				E9DB08922B4858B400F51053 /* LogManager.h */,
@@ -163,6 +168,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E9DB08932B4858B400F51053 /* LogManager.m in Sources */,
+				E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */,
 				E9F5C3322B483B6C001A7F40 /* EncryptionUtils.m in Sources */,
 				E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */,
 				E92244EB2B485F2400915F4C /* UIHelper.m in Sources */,
@@ -1128,8 +1128,6 @@ Persistent<Function> r_call;
 std::queue<std::string> q;

 void run(char *json) {
-  printf("signal received %s\n", json);
-
  std::string str(json);
  q.push(str);
 }
@@ -1165,6 +1165,21 @@
    }
  },

+  {
+    "path": "androidx/databinding/databinding-common/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-common-3.5.3.pom": {
+        "sha1": "0f85f7500d68d4eaed465ec194e18779374a7a68",
+        "sha256": "sha256-paY7t0Iz/AxIVcvQLT4sAPgqTvvMChxgS3SmWRod2tw="
+      },
+      "databinding-common-3.5.3.jar": {
+        "sha1": "72bb6cb779ae61710a01ff76d9d3cab355c44a4f",
+        "sha256": "sha256-WRoV+qBtmUWoqA8m8n2vBosrLirqakvhN7/SixHZVgA="
+      }
+    }
+  },
+
  {
    "path": "androidx/databinding/databinding-common/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -1274,6 +1289,21 @@
    }
  },

+  {
+    "path": "androidx/databinding/databinding-compiler-common/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-compiler-common-3.5.3.pom": {
+        "sha1": "345b6f4cea120faa14f118c08150de5d8afccce1",
+        "sha256": "sha256-LRdv8FuX6tdlmxdHuhK/a/bhc8zIONVFAniG0toDu+A="
+      },
+      "databinding-compiler-common-3.5.3.jar": {
+        "sha1": "32bfc30c00fdc550723ffd9bff3ef2471fbd4a3a",
+        "sha256": "sha256-yDZslWiT00cwjhF5Be1v2xq+gFW54gEhOrjyMO3GNRg="
+      }
+    }
+  },
+
  {
    "path": "androidx/databinding/databinding-compiler-common/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2972,6 +3002,21 @@
    }
  },

+  {
+    "path": "com/android/databinding/baseLibrary/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "baseLibrary-3.5.3.pom": {
+        "sha1": "81372394c257edc4595cf19c33f7460892eeaa3e",
+        "sha256": "sha256-knlU7d5unzROdh7YkGliIzSrDWc3i9B2rDIkfhX/Bmk="
+      },
+      "baseLibrary-3.5.3.jar": {
+        "sha1": "5da8b7daa2f10ec359a13ee778eeabf15c1758b1",
+        "sha256": "sha256-zebU7vY+5eBbiqtY/4Xq85zD5u2E/RhL9lWNgvjZwGc="
+      }
+    }
+  },
+
  {
    "path": "com/android/databinding/baseLibrary/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3475,6 +3520,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/crash/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "crash-26.5.3.pom": {
+        "sha1": "2b6f117c8542a9132bbd1982960ff93be002eb77",
+        "sha256": "sha256-ZrYgjqqWCNZ7K84UQIlBptcRC4ePlCVTmsIeuEWnqBU="
+      },
+      "crash-26.5.3.jar": {
+        "sha1": "d199e964be1fa3e7162344b91336afae6c7ea789",
+        "sha256": "sha256-86x29qjj+M7mPiqew2n87T3przHhRQzZOdiHXWcT758="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/crash/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3599,6 +3659,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/protos/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "protos-26.5.3.pom": {
+        "sha1": "a2452eb3233ef51f1dda9b5508cfe340134b4978",
+        "sha256": "sha256-FYV7IPvj+TmJoQA2xD32xOTygrtjh07jAghoOH7gRuY="
+      },
+      "protos-26.5.3.jar": {
+        "sha1": "16d70f0d597eac5d39180b1ce2d9b274f8802cf9",
+        "sha256": "sha256-8uut8euJZzFc/sTTw3UkQFSh8W15+N4l0eiYPVq0D70="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/protos/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3723,6 +3798,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/shared/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "shared-26.5.3.pom": {
+        "sha1": "14c908921dd73687f66f496dfc73fa807d57e40d",
+        "sha256": "sha256-FkUuC4D4/OiS5yBlJvWnupvlSungNjArA0ktU240P54="
+      },
+      "shared-26.5.3.jar": {
+        "sha1": "594abc68f0518057cdb150e4c8cc73bc5c94183e",
+        "sha256": "sha256-dpzYinI6GR6dmPsEGULf5Irzo+8kqP6wCI2NTNfhurA="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/shared/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3847,6 +3937,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/tracker/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "tracker-26.5.3.pom": {
+        "sha1": "8551b232bde0e0cd7a9983f4acc716ed2fa8d59b",
+        "sha256": "sha256-fAbjPrxxjgXSaoM5kD9ZoVTedhcXTPha/bxi0Nsgnkc="
+      },
+      "tracker-26.5.3.jar": {
+        "sha1": "6a84a345f5155eca774cd238c233a2f6fad551b9",
+        "sha256": "sha256-dqhsU6BlaXcW4tXGEAyd4LrpHVacu5vRn6U+Pw5n63M="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/tracker/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3971,6 +4076,21 @@
    }
  },

+  {
+    "path": "com/android/tools/annotations/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "annotations-26.5.3.pom": {
+        "sha1": "03c6890f54f0b7c91aaeb7d66e87c52e53b10d79",
+        "sha256": "sha256-4vEHB5aOWAXrLslhHTRa1GVrKLeEpApil0rlXPIQzh4="
+      },
+      "annotations-26.5.3.jar": {
+        "sha1": "87a36f2086b41d1ec162a6e74c4f999d58eb1310",
+        "sha256": "sha256-/js3c6HdNGlY2KFUess2UN/74HfTmtdMX3b7f6k/NYw="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/annotations/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4383,6 +4503,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/apksig/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apksig-3.5.3.pom": {
+        "sha1": "fe080d599c11357971f21a2b7475d9915515d363",
+        "sha256": "sha256-5sSQBWPiQJf82rf++W6oPPf6sfSTn6teEVRL8Ng0LZ0="
+      },
+      "apksig-3.5.3.jar": {
+        "sha1": "d5ffda89f909743ad8e77b3c28ed351695037543",
+        "sha256": "sha256-SMfd+nhnEtdmpzyt1+3JGGhsGv1s6FcRyvUQYx+0CQ8="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/apksig/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4492,6 +4627,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/apkzlib/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apkzlib-3.5.3.pom": {
+        "sha1": "d41d21481aa9ea302638d5008d1c54e391981843",
+        "sha256": "sha256-unLu4SDrvKUNUxJUZlaH2INOewFTQfQfdi2GKoiPDrI="
+      },
+      "apkzlib-3.5.3.jar": {
+        "sha1": "8e17d7b8bb5f756c139619d86facca1675bc6164",
+        "sha256": "sha256-aNpGeSdH6yIHK7PygeptifcYAB6Mmaa75oYJM/73qdw="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/apkzlib/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4616,6 +4766,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-model/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-model-3.5.3.pom": {
+        "sha1": "64d0223622a2c59fb67f8fb5c22b6535efef29b5",
+        "sha256": "sha256-8kaKB3hYve1NA/D8BkGjtpr5zskjdqqjht3XoSTIQQM="
+      },
+      "builder-model-3.5.3.jar": {
+        "sha1": "775377503072e1b6a701c3ea923c468cedd4e2eb",
+        "sha256": "sha256-U1xpawkp6LOZLwiCPpTFtci+UzCVThX8TuFhCW+gT6I="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-model/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4752,6 +4917,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-test-api/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-test-api-3.5.3.pom": {
+        "sha1": "f910b8864ae8e3e3c39823ca7ca6ba99a09d7564",
+        "sha256": "sha256-9IV0lJ6wAgzUWwuGES1aMXxpH+0OPxPYzY7VNbmksUI="
+      },
+      "builder-test-api-3.5.3.jar": {
+        "sha1": "cf9ce50cd19a816c5bc7d4c6362699aa98c8ac0f",
+        "sha256": "sha256-euZFcKEsjav85tiA+KSNsVqoMRHbcC2iTAWvv3H8FUc="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-test-api/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4888,6 +5068,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-3.5.3.pom": {
+        "sha1": "b327e842abd63da2281e74c59de69ab2b5998443",
+        "sha256": "sha256-dNWTs6MgZG6PVaytZxU/2aWQk8a3lqkGYmbXPzO99ZA="
+      },
+      "builder-3.5.3.jar": {
+        "sha1": "39bba1af533b25f6c1140e3c795ff815a6ad86ba",
+        "sha256": "sha256-BcvZGDubmg4SisvDkSVAwXLg11pcNY2kZcb3F5JMV0E="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5129,6 +5324,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle-api/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-api-3.5.3.pom": {
+        "sha1": "ef22e3a71efd8cb517d4b039076f4b69013c0208",
+        "sha256": "sha256-1T+FRJWgpHkt+LVOWXFAdtk3HW9ah5AABwdUoYDS7kU="
+      },
+      "gradle-api-3.5.3.jar": {
+        "sha1": "c1d6a6b3e5b744caaf6eea2452d8db62c8e2882f",
+        "sha256": "sha256-yOi/eI7S+LRswAqWJOAKivQLwx/x2CmL10DxhAC9PS4="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle-api/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5299,6 +5509,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-3.5.3.pom": {
+        "sha1": "6bfb2b4c34c37c4f2addcb6d99db19fa7a1a5810",
+        "sha256": "sha256-k8NC3tdmWdVBdyaKn9lBLf4HLozxd26vtHxZCBmOZdI="
+      },
+      "gradle-3.5.3.jar": {
+        "sha1": "12e36e5f81cc2face28e0c14cb98941d773cae6a",
+        "sha256": "sha256-Zyk97dM5uJypz2xEAJvNj4Bb9CnCVYYuq/LeuBDYuRA="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle/3.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5563,6 +5788,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/manifest-merger/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "manifest-merger-26.5.3.pom": {
+        "sha1": "4cc40406dfe779b3b575e66c970ae0e9986b0c94",
+        "sha256": "sha256-ZjxoTo8jLgEYXLnqBwjqCRwxAhYiDHlQthqQZlX0Vj4="
+      },
+      "manifest-merger-26.5.3.jar": {
+        "sha1": "36674041b9d2644a30b75b6d8b7106bc16eac78a",
+        "sha256": "sha256-tGBtBgLyH5GhdM+4UWtabpj/rJWNPzzYmTuVDvSbgEk="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/manifest-merger/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5699,6 +5939,21 @@
    }
  },

+  {
+    "path": "com/android/tools/common/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "common-26.5.3.pom": {
+        "sha1": "ace0f2945bba30c12223d7634a69da21a4242fd7",
+        "sha256": "sha256-9ikVDGRk14qviKUSEpiyeycF0HdW2W5hH6/yuJgdgeQ="
+      },
+      "common-26.5.3.jar": {
+        "sha1": "47409edcd2331596b42c33160101a86046e1c6f5",
+        "sha256": "sha256-YAVo9B+xn8eWSHtvxTnlKr0Jj60cZ4vONcAqMVGeJPY="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/common/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5823,6 +6078,21 @@
    }
  },

+  {
+    "path": "com/android/tools/ddms/ddmlib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "ddmlib-26.5.3.pom": {
+        "sha1": "f69c10111005d9ed625cc0b75fed9c5c2fcd1bcb",
+        "sha256": "sha256-y79URq2NFK1PQ/kl063FlIr3hP7NdEvk04bf50sXe1s="
+      },
+      "ddmlib-26.5.3.jar": {
+        "sha1": "804a61e67286eeec17d195c78a135f0ed2fbdb8a",
+        "sha256": "sha256-IlrK31Fopg4wIKM81mm6TYatse+ePnEhcREd4t+RrCs="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/ddms/ddmlib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -5947,6 +6217,21 @@
    }
  },

+  {
+    "path": "com/android/tools/dvlib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "dvlib-26.5.3.pom": {
+        "sha1": "1983f43ea2ef12519c4ac4579930af7494b4fb1c",
+        "sha256": "sha256-HNYT321rRp1fKslux7VIkAzONv7xDrPJAZVIITehh5c="
+      },
+      "dvlib-26.5.3.jar": {
+        "sha1": "9caa13fe83508ba5687199c02b7ddb885abd8f14",
+        "sha256": "sha256-+f3/TUDUJ1vhgAWJ2GlS33ErcQa7MD2o5f5zaqIogGU="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/dvlib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6146,6 +6431,21 @@
    }
  },

+  {
+    "path": "com/android/tools/layoutlib/layoutlib-api/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "layoutlib-api-26.5.3.pom": {
+        "sha1": "75263963e8b5baa185153cbdf1a5347628a71927",
+        "sha256": "sha256-Qs1kefYxk/LNrFGbBIi08IbYhToLabRA84yCWHE09eE="
+      },
+      "layoutlib-api-26.5.3.jar": {
+        "sha1": "6549e729f3f27c7d05049494f25cfd01890c00e0",
+        "sha256": "sha256-/7VaULd7u4vTgnr7gpGhRVzZU7EmBYzP3db/rvkwM9A="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/layoutlib/layoutlib-api/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6315,6 +6615,21 @@
    }
  },

+  {
+    "path": "com/android/tools/lint/lint-gradle-api/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "lint-gradle-api-26.5.3.pom": {
+        "sha1": "ce7c04f4c18db0fe372667092500726dc1436b2b",
+        "sha256": "sha256-tD6Ht965r/ZdBmPvIpAUoOyV9OsgUpxwTbEXrkq7I00="
+      },
+      "lint-gradle-api-26.5.3.jar": {
+        "sha1": "34f6edb87863c7e9f89f24c36485374ad350166a",
+        "sha256": "sha256-+xQk+cpYS2WRw5znSR5tiXYAVx4XPPkogrqTQWPGDMQ="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/lint/lint-gradle-api/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6559,6 +6874,21 @@
    }
  },

+  {
+    "path": "com/android/tools/repository/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "repository-26.5.3.pom": {
+        "sha1": "f8f4198066a0abb5dd28ddf7e7bbb9ce9c6df714",
+        "sha256": "sha256-1VAgYQtJuNTY+UgjN7nkcyAEjcxoEYb4tLuJAxaMxUE="
+      },
+      "repository-26.5.3.jar": {
+        "sha1": "91466e99a63da0267b17bdfb617f54582e311618",
+        "sha256": "sha256-X8tsUpwFkmiZtGzyUA46ChpjOV59RY6na8sHXKoF1Lg="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/repository/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6683,6 +7013,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdklib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdklib-26.5.3.pom": {
+        "sha1": "08fa943d8253d6301e2dd02bb953fe73bd1406f7",
+        "sha256": "sha256-UQ3bott3wc/Uw37/g/L25qPv4gXqt8Zkgu7QAUgtsTs="
+      },
+      "sdklib-26.5.3.jar": {
+        "sha1": "8c305bc044ad81115859eb964c2829cbea70b036",
+        "sha256": "sha256-H8X6i5qnJUBBwF5s8fPrqfR7BJH3p4ZDwhy+eylFHkI="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdklib/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -6807,6 +7152,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdk-common/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdk-common-26.5.3.pom": {
+        "sha1": "3fda12d2fca4442d791813f7a73399ff5f6e1973",
+        "sha256": "sha256-RenED9V2i7mYpkVhbqjSVGv15o9fBkL34FpKhwZElZk="
+      },
+      "sdk-common-26.5.3.jar": {
+        "sha1": "cce8ff081940bb7c9b1368a4052f987091996887",
+        "sha256": "sha256-kDfQjhoo5b8rEzc6Dyo/hxRsRG/gkYeNNOtvHxyIBgk="
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdk-common/26.5.4",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -8041,16 +8401,16 @@
  },

  {
-    "path": "commons-io/commons-io/2.16.0",
+    "path": "commons-io/commons-io/2.16.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "commons-io-2.16.0.pom": {
-        "sha1": "22e76fdc24c77e80b362d1f060a3cc073de3f0a9",
-        "sha256": "sha256-9EvmklZbB2a+vlkKSwQdm12rJP7QtGqs7niXBCiISlY="
+      "commons-io-2.16.1.pom": {
+        "sha1": "553d6f69e338060a231755afe0ebf99d14b45da6",
+        "sha256": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
      },
-      "commons-io-2.16.0.jar": {
-        "sha1": "27875a7935f1ddcc13267eb6fae1f719e0409572",
-        "sha256": "sha256-0eQXkBI1+uOqDLlza66vW3Tec0mBfRxyOQ2C49g9Opc="
+      "commons-io-2.16.1.jar": {
+        "sha1": "377d592e740dc77124e0901291dbfaa6810a200e",
+        "sha256": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8="
      }
    }
  },
@@ -11878,12 +12238,12 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-bom/4.26.1",
+    "path": "com/google/protobuf/protobuf-bom/4.27.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-bom-4.26.1.pom": {
-        "sha1": "7c6506f4a6d11e3aa7c3591c494433926eb4fefa",
-        "sha256": "sha256-hmAoc/EHNFQ9kMB/D/e/3+OXSeHCViGEwMiQmpJqbaw="
+      "protobuf-bom-4.27.0-RC1.pom": {
+        "sha1": "27a037f37e7e95b5e28ec5cd410ed99d34eb0a29",
+        "sha256": "sha256-ilnU8jEpEPRz7kIC0n8QQBt1nSyGY6xr/dQP299Bfy4="
      }
    }
  },
@@ -12129,16 +12489,16 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-java/4.26.1",
+    "path": "com/google/protobuf/protobuf-java/4.27.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-java-4.26.1.pom": {
-        "sha1": "5d394cabfc69ca65c22694fabcc074f324a7af43",
-        "sha256": "sha256-Gqr40NPAcUMZpemmtrMDxw4PYHa3t0vTvz/bh133mXE="
+      "protobuf-java-4.27.0-RC1.pom": {
+        "sha1": "8c2f747548d2fafc3e9b057cee34c343dc47e78e",
+        "sha256": "sha256-n9A6OYpEYg/F4Um5bKFXFb/1zQkxiNk7nGaSmmj087w="
      },
-      "protobuf-java-4.26.1.jar": {
-        "sha1": "594fabdcbceb7edfb883fe621d3e97d9cc05fa73",
-        "sha256": "sha256-CRkz5YcK+BB0gyb3rOSmc6ynISUxd1QoQvBEtUbxQoI="
+      "protobuf-java-4.27.0-RC1.jar": {
+        "sha1": "f37d7fb8ab06eee5ae3dd11c121f63a8b209e74f",
+        "sha256": "sha256-MW6bDi8Ee6d42j4PgT+0lqqzysiu/qRTRiIAi2bAcyk="
      }
    }
  },
@@ -12258,12 +12618,12 @@
  },

  {
-    "path": "com/google/protobuf/protobuf-parent/4.26.1",
+    "path": "com/google/protobuf/protobuf-parent/4.27.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "protobuf-parent-4.26.1.pom": {
-        "sha1": "cc071c128d5a376a30a2ecf145127532e7a17bae",
-        "sha256": "sha256-rMorllL7bwEHXmdbfDShbtGZIVlUb651lvKZ2HYnbY0="
+      "protobuf-parent-4.27.0-RC1.pom": {
+        "sha1": "59b00c8642d1166a189ebdcc529d3de170c8c56c",
+        "sha256": "sha256-mdkAVgkc3DOMTzc5ghqX3ICl1+ajWVFVWdw//1f73+E="
      }
    }
  },
@@ -15585,6 +15945,17 @@
    }
  },

+  {
+    "path": "org/apache/commons/commons-parent/69",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-69.pom": {
+        "sha1": "6ebeacd37818d945d96c06b44af10e050d2ef7c4",
+        "sha256": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+      }
+    }
+  },
+
  {
    "path": "org/apache/httpcomponents/httpclient/4.1.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17141,12 +17512,12 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.build/0.8.11",
+    "path": "org/jacoco/org.jacoco.build/0.8.12",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.build-0.8.11.pom": {
-        "sha1": "e5a356ca72993fc163a454402a55c2043071d350",
-        "sha256": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws="
+      "org.jacoco.build-0.8.12.pom": {
+        "sha1": "ae9ec17957c52ffa34ec82bb59bc0a2b9b3554c0",
+        "sha256": "sha256-JQ3MmhAD6CCVkz9khpI3dS825wy4pj8s35mwyWE8Cbk="
      }
    }
  },
@@ -17167,16 +17538,16 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.core/0.8.11",
+    "path": "org/jacoco/org.jacoco.core/0.8.12",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.core-0.8.11.pom": {
-        "sha1": "e1aa8f9270a5fcc432cf0c185c871b3e4820f5e9",
-        "sha256": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E="
+      "org.jacoco.core-0.8.12.pom": {
+        "sha1": "bc76db6af48fc259f0c66ac8b6d9ce2dd73ea77b",
+        "sha256": "sha256-qgsnc3hohtUdGI1+0aQ/Z276ISeFIERb/vDMtdjL5xc="
      },
-      "org.jacoco.core-0.8.11.jar": {
-        "sha1": "2ea73c899b5d6cde2a0a5e0ca29268b37622845d",
-        "sha256": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c="
+      "org.jacoco.core-0.8.12.jar": {
+        "sha1": "c2a45bd054bbacfe9998cbbf1a49010c62e48cbc",
+        "sha256": "sha256-/KJts3wMX71dxJhSN+uChm35eZ1Qgq+JlHWnP5H1sDU="
      }
    }
  },
@@ -18867,16 +19238,16 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta5",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-reflect-2.0.0-Beta5.pom": {
-        "sha1": "dd7f7eb5dfa88db62699bcd48d1b6e1ef4ff48fc",
-        "sha256": "sha256-vZDJOB++CfFO6xpEb8Z+gk4Geh4UEr6WVoNRB4hcpxQ="
+      "kotlin-reflect-2.0.0-RC1.pom": {
+        "sha1": "b08c97cfaffcdf60a6db35b13def6cde1aed6d31",
+        "sha256": "sha256-9NoPwtEYJp0xCTkijwRiV3ri4UFEdh0PojqTWH/nvpI="
      },
-      "kotlin-reflect-2.0.0-Beta5.jar": {
-        "sha1": "ecb1578f5e5a1fa0cec6f4e926ced14989724274",
-        "sha256": "sha256-4xzU/UOloKuez/MUVapHwTl9ZzvkJ8FjkqxNQBf+BOo="
+      "kotlin-reflect-2.0.0-RC1.jar": {
+        "sha1": "3d4ec6ec94e86fd10957c78471f98373e899dd2e",
+        "sha256": "sha256-BsavyQLOwArroQNLg97ck3PaB6kJBpyLZDwq+mAvW5w="
      }
    }
  },
@@ -20409,28 +20780,28 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta5",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-stdlib-2.0.0-Beta5.pom": {
-        "sha1": "cfb0a9c66ddf657aac640d1a38169eb12de0f557",
-        "sha256": "sha256-NAO5vBthXEMJKGzn8eQ6teYhT5Brf53uG5G90li4pNk="
+      "kotlin-stdlib-2.0.0-RC1.pom": {
+        "sha1": "acf44b7e30e2500a0e1fed7bfc0c9bc6cc8fe65e",
+        "sha256": "sha256-nVnonn+ye/SexoelpxZXCz8srOtUH95WNwKKAPXf86I="
      },
-      "kotlin-stdlib-2.0.0-Beta5-all.jar": {
-        "sha1": "e18c835dd9fe6430f006ef2060595f3e5c0473bf",
-        "sha256": "sha256-o+o5Diku/+bWDD4IQjottN68NiB4sQvtHmE7qy7ru3U="
+      "kotlin-stdlib-2.0.0-RC1-all.jar": {
+        "sha1": "496ce100c4aa6dabf67dc1c0443076f42197a535",
+        "sha256": "sha256-aiXa9C5VAsj0YGF053MUD2Olq3z1Vj9CD849pASBoIo="
      },
-      "kotlin-stdlib-2.0.0-Beta5-common.jar": {
+      "kotlin-stdlib-2.0.0-RC1-common.jar": {
        "sha1": "281e03983850e590dcc0d2474758f2fa8dd0e96a",
        "sha256": "sha256-EsHDu0lApPmVlUD/tc8uLl6brNtoywDEvSidFjm9HSc="
      },
-      "kotlin-stdlib-2.0.0-Beta5.jar": {
-        "sha1": "763714203113a7f4a5477122be0c6c588df0116e",
-        "sha256": "sha256-vJdkbUp8fwtJ6An+ZapdbGVNWfM3rQziphgPVxdpfWk="
+      "kotlin-stdlib-2.0.0-RC1.jar": {
+        "sha1": "ad47aa314788daa709fe419d843fccc28a6c6edf",
+        "sha256": "sha256-u7LJuBPmGW+a+p+a3Ys5XuOEqxdjoIgOCE0pQiFPHDA="
      },
-      "kotlin-stdlib-2.0.0-Beta5.module": {
-        "sha1": "e4e16c1cf436d27d4d80cd504e636feaffbc376a",
-        "sha256": "sha256-ZBntY3Vrx0lM5sR2jdkZhsSPB1ZTdTOSi5uggHroWjk="
+      "kotlin-stdlib-2.0.0-RC1.module": {
+        "sha1": "d59c1362007ed529e61cabb999c5fba72ce232d2",
+        "sha256": "sha256-NZ7bRyR/SM+y/HVTWPsjAXt0sN1GUsynslWbvCKMu30="
      }
    }
  },
@@ -53,14 +53,14 @@ androidx.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
-androidx.databinding:databinding-common:3.5.4
+androidx.databinding:databinding-common:3.5.3
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
 androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
-androidx.databinding:databinding-compiler-common:3.5.4
+androidx.databinding:databinding-compiler-common:3.5.3
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
@@ -164,7 +164,7 @@ com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
-com.android.databinding:baseLibrary:3.5.4
+com.android.databinding:baseLibrary:3.5.3
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
@@ -173,7 +173,7 @@ com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
-com.android.tools.analytics-library:crash:26.5.4
+com.android.tools.analytics-library:crash:26.5.3
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
@@ -181,7 +181,7 @@ com.android.tools.analytics-library:crash:30.3.1
 com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
-com.android.tools.analytics-library:protos:26.5.4
+com.android.tools.analytics-library:protos:26.5.3
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
@@ -189,7 +189,7 @@ com.android.tools.analytics-library:protos:30.3.1
 com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
-com.android.tools.analytics-library:shared:26.5.4
+com.android.tools.analytics-library:shared:26.5.3
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
@@ -197,7 +197,7 @@ com.android.tools.analytics-library:shared:30.3.1
 com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
-com.android.tools.analytics-library:tracker:26.5.4
+com.android.tools.analytics-library:tracker:26.5.3
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
@@ -226,14 +226,14 @@ com.android.tools.build:aaptcompiler:7.3.1
 com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
-com.android.tools.build:apksig:3.5.4
+com.android.tools.build:apksig:3.5.3
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
 com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
-com.android.tools.build:apkzlib:3.5.4
+com.android.tools.build:apkzlib:3.5.3
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
@@ -243,7 +243,7 @@ com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
-com.android.tools.build:builder-model:3.5.4
+com.android.tools.build:builder-model:3.5.3
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
@@ -253,7 +253,7 @@ com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
-com.android.tools.build:builder-test-api:3.5.4
+com.android.tools.build:builder-test-api:3.5.3
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
@@ -263,7 +263,7 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
-com.android.tools.build:builder:3.5.4
+com.android.tools.build:builder:3.5.3
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
@@ -278,7 +278,7 @@ com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
-com.android.tools.build:gradle-api:3.5.4
+com.android.tools.build:gradle-api:3.5.3
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
@@ -292,7 +292,7 @@ com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
-com.android.tools.build:gradle:3.5.4
+com.android.tools.build:gradle:3.5.3
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
@@ -301,7 +301,7 @@ com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
-com.android.tools.build:manifest-merger:26.5.4
+com.android.tools.build:manifest-merger:26.5.3
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
@@ -313,7 +313,7 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
-com.android.tools.ddms:ddmlib:26.5.4
+com.android.tools.ddms:ddmlib:26.5.3
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
@@ -328,7 +328,7 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
-com.android.tools.layoutlib:layoutlib-api:26.5.4
+com.android.tools.layoutlib:layoutlib-api:26.5.3
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
@@ -341,7 +341,7 @@ com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
-com.android.tools.lint:lint-gradle-api:26.5.4
+com.android.tools.lint:lint-gradle-api:26.5.3
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
@@ -382,7 +382,7 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
-com.android.tools:annotations:26.5.4
+com.android.tools:annotations:26.5.3
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
@@ -392,7 +392,7 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
-com.android.tools:common:26.5.4
+com.android.tools:common:26.5.3
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
@@ -402,7 +402,7 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
-com.android.tools:dvlib:26.5.4
+com.android.tools:dvlib:26.5.3
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
@@ -410,7 +410,7 @@ com.android.tools:dvlib:30.3.1
 com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
-com.android.tools:repository:26.5.4
+com.android.tools:repository:26.5.3
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
@@ -420,7 +420,7 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
-com.android.tools:sdklib:26.5.4
+com.android.tools:sdklib:26.5.3
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
@@ -430,7 +430,7 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
-com.android.tools:sdk-common:26.5.4
+com.android.tools:sdk-common:26.5.3
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
@@ -942,4 +942,5 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
 com.android.tools.build:gradle:8.1.1
 com.google.errorprone:error_prone_annotations:2.7.1
 com.android.tools.lint:lint-gradle:31.1.1
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4
@@ -68,6 +68,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.9.0/core-1.9.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.3/databinding-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
@@ -75,6 +76,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/8.1.1/databinding-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
@@ -181,6 +183,7 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.3/baseLibrary-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
@@ -214,6 +217,7 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/su
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.3/crash-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
@@ -222,6 +226,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/31.1.1/crash-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.3/protos-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
@@ -230,6 +235,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/31.1.1/protos-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.3/shared-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
@@ -238,6 +244,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/31.1.1/shared-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.3/tracker-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
@@ -246,6 +253,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.1.1/tracker-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.3/annotations-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
@@ -270,6 +278,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/8.1.1/aaptcompiler-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.3/apksig-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
@@ -277,6 +286,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/8.1.1/apksig-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.3/apkzlib-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
@@ -285,6 +295,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.1.1/apkzlib-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.3/builder-model-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
@@ -293,6 +304,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/8.1.1/builder-model-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.3/builder-test-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
@@ -301,6 +313,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/8.1.1/builder-test-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.3/builder-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
@@ -316,6 +329,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.14.0/bundletool-1.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.3/gradle-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
@@ -326,6 +340,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/8.1.1/gradle-settings-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.3/gradle-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
@@ -342,6 +357,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.3/manifest-merger-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
@@ -350,6 +366,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/31.1.1/manifest-merger-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.3/common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
@@ -358,6 +375,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/common/31.1.1/common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.3/ddmlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
@@ -366,6 +384,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/31.1.1/ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.3/dvlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
@@ -379,6 +398,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/31.1.1/uast-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.3/layoutlib-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
@@ -390,6 +410,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/l
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/31.1.1/lint-checks-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.3/lint-gradle-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/31.1.1/lint-gradle-31.1.1.pom
@@ -406,6 +427,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/31.1.1/play-sdk-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.3/repository-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
@@ -414,6 +436,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/31.1.1/repository-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.3/sdklib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
@@ -422,6 +445,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/31.1.1/sdklib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.3/sdk-common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
@@ -501,7 +525,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-co
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
-https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.0/commons-io-2.16.0.pom
+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.1/commons-logging-1.3.1.pom
@@ -744,7 +768,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.26.1/protobuf-bom-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC1/protobuf-bom-4.27.0-RC1.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
@@ -761,7 +785,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.26.1/protobuf-java-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC1/protobuf-java-4.27.0-RC1.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
@@ -772,7 +796,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.26.1/protobuf-parent-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC1/protobuf-parent-4.27.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
@@ -1012,6 +1036,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/66/commons-parent-66.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/67/commons-parent-67.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/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
@@ -1125,9 +1150,9 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-cor
 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/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.11/org.jacoco.build-0.8.11.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
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.11/org.jacoco.core-0.8.11.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.12/org.jacoco.core-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
@@ -1223,7 +1248,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.0-Beta5/kotlin-reflect-2.0.0-Beta5.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC1/kotlin-reflect-2.0.0-RC1.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
@@ -1325,7 +1350,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.0-Beta5/kotlin-stdlib-2.0.0-Beta5.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC1/kotlin-stdlib-2.0.0-RC1.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
@@ -54,7 +54,8 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
 com.android.tools.build:gradle:8.1.1
 com.google.errorprone:error_prone_annotations:2.7.1
 com.android.tools.lint:lint-gradle:31.1.1
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0' \
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4' \
        >> "${DEPS_LIST}"
 }

@@ -22,7 +22,6 @@ react-native-image-resizer
 react-native-keychain
 react-native-linear-gradient
 react-native-lottie-splash-screen
-react-native-mail
 react-native-navigation
 react-native-nfc-manager
 react-native-orientation-locker
@@ -48,7 +48,6 @@
    "react-native-keychain": "8.1.2",
    "react-native-linear-gradient": "^2.8.0",
    "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-mail": "6.1.1",
    "react-native-navigation": "7.38.3",
    "react-native-orientation-locker": "^1.5.0",
    "react-native-permissions": "4.1.5",
@@ -1,15 +0,0 @@
--- /tmp/tmp-status-mobile-6e854428f/tmp.PSruc8WtHx/build.gradle	2024-04-17 11:08:46.857319000 +0200
-+++ ./node_modules/react-native-mail/android/build.gradle	2024-04-17 11:09:22.935436792 +0200
-@@ -1,7 +1,11 @@
- apply plugin: 'com.android.library'
- 
-+def safeExtGet(prop, fallback) {
-+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-+}
-+
- android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : 23
-+    compileSdkVersion safeExtGet('compileSdkVersion', 30)
-     buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : "23.0.1"
- 
-     defaultConfig {
@@ -1,99 +0,0 @@
-(ns legacy.status-im.contact.block
-  (:require
-    [legacy.status-im.contact.db :as contact.db]
-    [legacy.status-im.data-store.chats :as chats-store]
-    [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
-    [status-im.contexts.chat.contacts.events :as contacts-store]
-    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
-    [status-im.navigation.events :as navigation]
-    [utils.re-frame :as rf]))
-
-(rf/defn clean-up-chat
-  [{:keys [db]}
-   public-key
-   {:keys [chat-id
-           unviewed-messages-count
-           unviewed-mentions-count
-           last-message]}]
-  (let [removed-messages-ids (keep
-                              (fn [[message-id {:keys [from]}]]
-                                (when (= from public-key)
-                                  message-id))
-                              (get-in db [:messages chat-id]))
-        db                   (-> db
-                                 ;; remove messages
-                                 (update-in [:messages chat-id]
-                                            #(apply dissoc % removed-messages-ids))
-                                 (update-in [:chats chat-id]
-                                            assoc
-                                            :unviewed-messages-count unviewed-messages-count
-                                            :unviewed-mentions-count unviewed-mentions-count
-                                            :last-message            last-message))]
-    {:db (assoc-in db
-          [:message-lists chat-id]
-          (message-list/add-many nil (vals (get-in db [:messages chat-id]))))}))
-
-(rf/defn contact-blocked
-  {:events [:contacts/blocked]}
-  [{:keys [db] :as cofx} {:keys [public-key]} chats-js]
-  (let [fxs (when chats-js
-              (map #(->> (chats-store/<-rpc %)
-                         (clean-up-chat public-key))
-                   (types/js->clj chats-js)))]
-    (apply
-     rf/merge
-     cofx
-     {:db (->
-            db
-            (update :chats dissoc public-key)
-            (update :chats-home-list disj public-key)
-            (assoc-in [:contacts/contacts public-key
-                       :added?]
-                      false))
-      :fx [[:activity-center.notifications/fetch-unread-count]
-           [:effects/push-notifications-clear-message-notifications [public-key]]
-           [:dispatch-later
-            [{:ms       500
-              :dispatch [:chat.ui/close-and-remove-chat public-key]}]]]}
-     fxs)))
-
-(rf/defn block-contact
-  {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
-  (let [contact               (-> (contact.db/public-key->contact
-                                   (:contacts/contacts db)
-                                   public-key)
-                                  (assoc :blocked? true
-                                         :added?   false
-                                         :active?  false))
-        current-chat-id       (:current-chat-id db)
-        from-one-to-one-chat? (not (get-in db [:chats current-chat-id :group-chat]))]
-    (rf/merge cofx
-              {:db (assoc-in db [:contacts/contacts public-key] contact)}
-              (contacts-store/block
-               public-key
-               (fn [^js block-contact]
-                 (re-frame/dispatch [:contacts/blocked contact (.-chats block-contact)])
-                 (re-frame/dispatch [:sanitize-messages-and-process-response block-contact])
-                 (re-frame/dispatch [:hide-popover])))
-              ;; reset navigation to avoid going back to non existing one to one chat
-              (when current-chat-id
-                (if from-one-to-one-chat?
-                  (navigation/pop-to-root :shell-stack)
-                  (navigation/navigate-back))))))
-
-(rf/defn contact-unblocked
-  {:events [:contacts/unblocked]}
-  [{:keys [db]} contact-id]
-  (let [contact (-> (get-in db [:contacts/contacts contact-id])
-                    (assoc :blocked? false))]
-    {:db (assoc-in db [:contacts/contacts contact-id] contact)}))
-
-(rf/defn unblock-contact
-  {:events [:contact.ui/unblock-contact-pressed]}
-  [cofx contact-id]
-  (contacts-store/unblock
-   cofx
-   contact-id
-   #(re-frame/dispatch [:contacts/unblocked contact-id])))
@@ -1,87 +0,0 @@
-(ns legacy.status-im.contact.db
-  (:require
-    [clojure.set :as set]
-    [clojure.string :as string]
-    [status-im.constants :as constants]
-    [utils.address :as address]))
-
-(defn public-key-and-ens-name->new-contact
-  [public-key ens-name]
-  (let [contact {:public-key public-key}]
-    (if ens-name
-      (-> contact
-          (assoc :ens-name ens-name)
-          (assoc :ens-verified true)
-          (assoc :name ens-name))
-      contact)))
-
-(defn public-key->contact
-  [contacts public-key]
-  (when public-key
-    (get contacts public-key {:public-key public-key})))
-
-(defn- contact-by-address
-  [[addr contact] address]
-  (when (address/address= addr address)
-    contact))
-
-(defn find-contact-by-address
-  [contacts address]
-  (some #(contact-by-address % address) contacts))
-
-(defn sort-contacts
-  [contacts]
-  (sort (fn [c1 c2]
-          (let [name1 (:primary-name c1)
-                name2 (:primary-name c2)]
-            (when (and name1 name2)
-              (compare (string/lower-case name1)
-                       (string/lower-case name2)))))
-        (vals contacts)))
-
-(defn query-chat-contacts
-  [{:keys [contacts]} all-contacts query-fn]
-  (let [participant-set (into #{} (filter identity) contacts)]
-    (query-fn (comp participant-set :public-key) (vals all-contacts))))
-
-(defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
-  (let [current-contact (some->
-                          current-account
-                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
-                          (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or display-name preferred-name name)))
-        all-contacts    (cond-> contacts
-                          current-contact
-                          (assoc public-key current-contact))]
-    (->> members
-         (map #(or (get all-contacts %)
-                   {:public-key %}))
-         (sort-by (comp string/lower-case
-                        (fn [{:keys [primary-name name alias public-key]}]
-                          (or primary-name
-                              name
-                              alias
-                              public-key))))
-         (map #(if (get admins (:public-key %))
-                 (assoc % :admin? true)
-                 %)))))
-
-(defn enrich-contact
-  ([contact] (enrich-contact contact nil nil))
-  ([{:keys [public-key] :as contact} setting own-public-key]
-   (cond-> contact
-     (and setting
-          (not= public-key own-public-key)
-          (or (= setting constants/profile-pictures-visibility-none)
-              (and (= setting constants/profile-pictures-visibility-contacts-only)
-                   (not (:added? contact)))))
-     (dissoc :images))))
-
-(defn enrich-contacts
-  [contacts profile-pictures-visibility own-public-key]
-  (reduce-kv
-   (fn [acc public-key contact]
-     (assoc acc public-key (enrich-contact contact profile-pictures-visibility own-public-key)))
-   {}
-   contacts))
@@ -1,49 +0,0 @@
-(ns legacy.status-im.contact.db-test
-  (:require [cljs.test :refer-macros [deftest is testing]]
-            [legacy.status-im.contact.db :as contact.db]))
-
-(deftest contacts-subs
-  (testing "get-all-contacts-in-group-chat"
-    (let
-      [chat-contact-ids
-       #{"0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"
-         "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"
-         "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}
-       admins
-       #{"0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"}
-
-       contacts
-       {"0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"
-        {:last-updated 0
-         :name "User B"
-         :primary-name "User B"
-         :last-online 0
-         :public-key
-         "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"}}
-       current-multiaccount
-       {:last-updated 0
-        :signed-up? true
-        :sharing-usage-data? false
-        :primary-name "User A"
-        :name "User A"
-        :public-key
-        "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}]
-      (is
-       (=
-        (contact.db/get-all-contacts-in-group-chat chat-contact-ids
-                                                   admins
-                                                   contacts
-                                                   current-multiaccount)
-        [{:admin? true
-          :public-key
-          "0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"}
-         {:alias "User A"
-          :primary-name "User A"
-          :public-key
-          "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}
-         {:last-updated 0
-          :name "User B"
-          :primary-name "User B"
-          :last-online 0
-          :public-key
-          "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"}])))))
@@ -5,7 +5,6 @@
    legacy.status-im.browser.core
    legacy.status-im.browser.permissions
    legacy.status-im.chat.models.loading
-    legacy.status-im.contact.block
    legacy.status-im.currency.core
    legacy.status-im.data-store.chats
    legacy.status-im.data-store.switcher-cards
@@ -59,7 +59,7 @@
                                     :selected-storage-type :default
                                     :selected-id           (-> result first :id)
                                     :step                  :choose-key))))
-   :navigate-to :choose-name})
+   :navigate-to [:choose-name (:theme db)]})

 (rf/defn generate-and-derive-addresses
  {:events [:generate-and-derive-addresses]}
@@ -3,7 +3,8 @@
    [clojure.string :as string]
    [legacy.status-im.utils.deprecated-types :as types]
    [react-native.platform :as platform]
-    [status-im.config :as config]))
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))

 (defn- add-log-level
  [config log-level]
@@ -105,7 +106,7 @@
    (some #(string/includes? (str %) "waku") ks)))

 (defn get-multiaccount-node-config
-  [{:keys [profile/profile :networks/networks :networks/current-network]
+  [{:keys [profile/profile :networks/current-network]
    :as   db}]
  (let [wakuv2-config (get profile :wakuv2-config {})
        fleet-key (current-fleet-key db)
@@ -116,7 +117,10 @@
        {:keys [installation-id log-level
                waku-bloom-filter-mode]}
        profile]
-    (cond-> (get-in networks [current-network :config])
+    (cond-> {:NetworkId      (chain/chain-keyword->chain-id :mainnet)
+             :DataDir        "/ethereum/mainnet_rpc"
+             :UpstreamConfig {:Enabled true
+                              :URL     config/mainnet-rpc-url}}
      :always
      (get-base-node-config)

@@ -173,5 +177,3 @@

      :always
      (add-log-level log-level))))
-
-
@@ -22,7 +22,7 @@
        :loading             @in-progress?
        :accessibility-label :block-contact-confirm
        :on-press            #(do (reset! in-progress? true)
-                                  (re-frame/dispatch [:contact.ui/block-contact-confirmed public-key]))}
+                                  (re-frame/dispatch [:contact/block-contact public-key]))}
       (i18n/label :t/block)]
      [react/view {:height 8}]
      [quo/button
@@ -56,7 +56,7 @@
            :selected            blocked?
            :icon                :main-icons/cancel
            :action              (if blocked?
-                                   #(re-frame/dispatch [:contact.ui/unblock-contact-pressed public-key])
+                                   #(re-frame/dispatch [:contact/unblock-contact public-key])
                                   #(re-frame/dispatch [:show-popover
                                                        {:view             sheets/block-contact
                                                         :prevent-closing? true
@@ -7,7 +7,6 @@
    [legacy.status-im.utils.deprecated-types :as types]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
-    [react-native.mail :as react-native-mail]
    [react-native.platform :as platform]
    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.common.log :as log]
@@ -182,7 +181,7 @@
 (re-frame/reg-fx
 :email/send
 (fn [[opts callback]]
-   (react-native-mail/mail (clj->js opts) callback)))
+   (native-module/mail (clj->js opts) callback)))

 (re-frame/reg-fx
 ::share-archive
@@ -46,6 +46,15 @@
  (when (exists? (.-NativeModules react-native))
    (.-NetworkManager ^js (.-NativeModules react-native))))

+(defn mail-manager
+  []
+  (when (exists? (.-NativeModules react-native))
+    (.-MailManager ^js (.-NativeModules react-native))))
+
+(defn mail
+  [opts callback]
+  (.mail ^js (mail-manager) (clj->js opts) callback))
+
 (defn init
  [handler]
  (.addListener ^js (.-DeviceEventEmitter ^js react-native) "gethEvent" #(handler (.-jsonEvent ^js %))))
@@ -12,8 +12,8 @@
         container-style))

 (defn input
-  []
-  (assoc (text/text-style {} nil)
+  [theme]
+  (assoc (text/text-style {} theme)
         :height              32
         :flex-grow           1
         :padding-vertical    5
@@ -61,7 +61,7 @@
    [rn/view {:style (style/container container-style)}
     [rn/text-input
      (merge {:accessibility-label    :recovery-phrase-input
-              :style                  (style/input)
+              :style                  (style/input theme)
              :placeholder-text-color (style/placeholder-color state theme blur?)
              :cursor-color           (style/cursor-color customization-color theme)
              :keyboard-appearance    theme
@@ -17,26 +17,28 @@
   :flex-direction     :row
   :align-items        :center})

-(defn action-icon
-  [{:keys [type on-press on-check disabled? checked?]} customization-color theme]
-  [rn/touchable-opacity
-   {:on-press on-press}
-   (case type
-     :options
-     [icons/icon :i/options
-      {:size  20
-       :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
-     :checkbox
-     [selectors/view
-      {:type                :checkbox
-       :checked?            checked?
-       :customization-color customization-color
-       :accessibility-label :user-list-toggle-check
-       :disabled?           disabled?
-       :on-change           (when on-check on-check)}]
-     :close
-     [text/text "not implemented"]
-     [rn/view])])
+(defn accessory-item
+  [{:keys [type on-press on-check disabled? checked? child]} customization-color theme]
+  (if (= type :custom)
+    child
+    [rn/touchable-opacity
+     {:on-press on-press}
+     (case type
+       :options
+       [icons/icon :i/options
+        {:size  20
+         :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
+       :checkbox
+       [selectors/view
+        {:type                :checkbox
+         :checked?            checked?
+         :customization-color customization-color
+         :accessibility-label :user-list-toggle-check
+         :disabled?           disabled?
+         :on-change           (when on-check on-check)}]
+       :close
+       [text/text "not implemented"]
+       [rn/view])]))

 (defn user
  [{:keys [short-chat-key primary-name secondary-name photo-path online? contact? verified?
@@ -72,4 +74,4 @@
         :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
        short-chat-key])]
    (when accessory
-      [action-icon accessory customization-color disabled? theme])]])
+      [accessory-item accessory customization-color disabled? theme])]])
@@ -63,22 +63,23 @@

 (defn notification
  [{title-text :title :keys [avatar user header title-weight text body container-style theme]}]
-  (let [theme       theme
-        body        (or body (when text [message text theme]))
-        header      (or header
-                        (when title-text
-                          [title
-                           {:text       title-text
-                            :weight     title-weight
-                            :theme      theme
-                            :multiline? (some? body)}]))
-        header      (when header [header-container header])
-        body        (when body [body-container body])
-        user-avatar (or avatar (when user (user-avatar/user-avatar user)))
-        avatar      (when user-avatar
-                      [avatar-container
-                       {:multiline? (and header body)}
-                       user-avatar])]
+  (let [context-theme (quo.theme/use-theme)
+        theme         (or theme context-theme)
+        body          (or body (when text [message text theme]))
+        header        (or header
+                          (when title-text
+                            [title
+                             {:text       title-text
+                              :weight     title-weight
+                              :theme      theme
+                              :multiline? (some? body)}]))
+        header        (when header [header-container header])
+        body          (when body [body-container body])
+        user-avatar   (or avatar (when user (user-avatar/user-avatar user)))
+        avatar        (when user-avatar
+                        [avatar-container
+                         {:multiline? (and header body)}
+                         user-avatar])]
    [quo.theme/provider theme
     [notification-container
      {:avatar          avatar
@@ -72,7 +72,8 @@
   "
  [{:keys [type icon title text action undo-duration undo-on-press container-style theme user]
    :or   {type :neutral icon :i/placeholder}}]
-  (let [context-theme theme
+  (let [context-theme (quo.theme/use-theme)
+        context-theme (or theme context-theme)
        icon-name     (case type
                        :positive (if (= theme :light)
                                    :i/correct
@@ -2,19 +2,23 @@
  (:require
    [quo.components.overlay.style :as style]
    [react-native.blur :as blur]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [react-native.safe-area :as safe-area]))

 (defn view
-  [{:keys [type container-style]} & children]
-  [rn/view {:style (style/overlay-background type)}
-   (if (= type :shell)
-     [blur/view
-      {:blur-amount   20
-       :blur-radius   25
-       :blur-type     :transparent
-       :overlay-color :transparent
-       :style         style/container}
-      [rn/view {:style (merge style/blur-container container-style)}
-       children]]
-     [rn/view {:style (merge style/container container-style)}
-      children])])
+  [{:keys [type container-style top-inset?]} & children]
+  (let [top-style (when top-inset? {:padding-top (safe-area/get-top)})]
+    [rn/view {:style (style/overlay-background type)}
+     (if (= type :shell)
+       [blur/view
+        {:blur-amount   20
+         :blur-radius   25
+         :blur-type     :transparent
+         :overlay-color :transparent
+         :style         style/container}
+        (into [rn/view
+               {:style (merge style/blur-container top-style container-style)}]
+              children)]
+       (into [rn/view
+              {:style (merge style/container top-style container-style)}]
+             children))]))
@@ -30,8 +30,10 @@
  (let [theme        (quo.theme/use-theme)
        color        (get-text-color theme (or blur? false))
        description? (not (nil? description))
-        root-view    (if (seq container-style) rn/view :<>)]
-    [root-view {:style container-style}
+        root-view    (if (seq container-style) rn/view :<>)
+        root-style   (when (seq container-style)
+                       {:style container-style})]
+    [root-view root-style
     [text/text
      {:number-of-lines 1
       :size            (if description? :paragraph-1 :paragraph-2)
@@ -22,16 +22,6 @@
 (defn- header
  [{:keys [on-legacy-press on-multichain-press address]}]
  [rn/view {:style style/header-container}
-   [tab/view
-    {:accessibility-label         :share-qr-code-multichain-tab
-     :id                          :wallet-multichain-tab
-     :active-item-container-style style/header-tab-active
-     :item-container-style        style/header-tab-inactive
-     :size                        24
-     :active                      (= :multichain address)
-     :on-press                    on-multichain-press}
-    (i18n/label :t/multichain)]
-   [rn/view {:style style/space-between-tabs}]
   [tab/view
    {:accessibility-label         :share-qr-code-legacy-tab
     :id                          :wallet-legacy-tab
@@ -40,7 +30,17 @@
     :size                        24
     :active                      (= :legacy address)
     :on-press                    on-legacy-press}
-    (i18n/label :t/legacy)]])
+    (i18n/label :t/legacy)]
+   [rn/view {:style style/space-between-tabs}]
+   [tab/view
+    {:accessibility-label         :share-qr-code-multichain-tab
+     :id                          :wallet-multichain-tab
+     :active-item-container-style style/header-tab-active
+     :item-container-style        style/header-tab-inactive
+     :size                        24
+     :active                      (= :multichain address)
+     :on-press                    on-multichain-press}
+    (i18n/label :t/multichain)]])

 (defn- info-label
  [share-qr-code-type]
@@ -16,19 +16,21 @@
    [schema.core :as schema]))

 (defn- tag-skeleton
-  [{:keys [theme size text] :or {size 24}} logo-component]
-  [rn/view {:style (style/tag-container size)}
-   logo-component
-   [rn/view {:style (style/tag-spacing size)}
-    [text/text
-     {:style  (style/text theme)
-      :weight :medium
-      :size   (if (= size 24) :paragraph-2 :paragraph-1)}
-     text]]])
+  [{:keys [size text] :or {size 24}} logo-component]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/tag-container size)}
+     logo-component
+     [rn/view {:style (style/tag-spacing size)}
+      [text/text
+       {:style  (style/text theme)
+        :weight :medium
+        :size   (if (= size 24) :paragraph-2 :paragraph-1)}
+       text]]]))

 (defn- communities-tag
-  [{:keys [theme size community-logo community-name blur? channel? channel-name]}]
-  (let [text-size (if (= size 24) :paragraph-2 :paragraph-1)
+  [{:keys [size community-logo community-name blur? channel? channel-name]}]
+  (let [theme     (quo.theme/use-theme)
+        text-size (if (= size 24) :paragraph-2 :paragraph-1)
        icon-size (if (= size 24) 16 20)]
    [rn/view {:style (style/tag-container size)}
     [fast-image/fast-image {:style (style/circle-logo size) :source community-logo}]
@@ -54,26 +56,28 @@
  (str (subs pk 0 5) "..." (subs pk (- (count pk) 3))))

 (defn- address-tag
-  [{:keys [theme size address]}]
-  [rn/view {:style (style/address size)}
-   [text/text
-    {:style  (style/text theme)
-     :weight :monospace ;; TODO: fix this style (issue #17009)
-     :size   (if (= size 24) :paragraph-2 :paragraph-1)}
-    (trim-public-key address)]])
+  [{:keys [size address]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/address size)}
+     [text/text
+      {:style  (style/text theme)
+       :weight :monospace ;; TODO: fix this style (issue #17009)
+       :size   (if (= size 24) :paragraph-2 :paragraph-1)}
+      (trim-public-key address)]]))

 (defn- icon-tag
-  [{:keys [theme size icon blur? context]}]
-  [rn/view {:style (style/icon size)}
-   [icons/icon icon
-    {:color (style/context-tag-icon-color theme blur?)
-     :size  (if (= size 24) 12 20)}]
-   [rn/view {:style (style/icon-spacing size)}
-    [text/text
-     {:style  (style/text theme)
-      :weight :medium
-      :size   (if (= size 24) :paragraph-2 :paragraph-1)}
-     context]]])
+  [{:keys [size icon blur? context]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/icon size)}
+     [icons/icon icon
+      {:color (style/context-tag-icon-color theme blur?)
+       :size  (if (= size 24) 12 20)}]
+     [rn/view {:style (style/icon-spacing size)}
+      [text/text
+       {:style  (style/text theme)
+        :weight :medium
+        :size   (if (= size 24) :paragraph-2 :paragraph-1)}
+       context]]]))

 (defn- view-internal
  [{:keys [type size state blur? customization-color profile-picture full-name users
@@ -113,7 +113,7 @@
    (h/is-truthy (h/get-by-text "Title"))
    (h/is-truthy (h/get-by-label-text :address-text-input)))

-  (h/test "Address input"
+  (h/test "Recovery phrase"
    (h/render [page-top/view
               {:title "Title"
                :input :recovery-phrase}])
@@ -2,12 +2,9 @@
  (:require [quo.foundations.colors :as colors]))

 (def container
-  {:flex            1
-   :flex-direction  :row
+  {:flex-direction  :row
   :justify-content :space-between})

-(def right-container {:margin-left 20})
-
 (def right-counter
  {:padding-top    12
   :padding-bottom 2})
@@ -62,10 +62,8 @@
     :weight              :semi-bold
     :accessibility-label accessibility-label}
    title]
-   (when right
-     [rn/view {:style style/right-container}
-      (case right
-        :counter [right-counter props]
-        :action  [right-action props]
-        :tag     [right-tag props]
-        nil)])])
+   (case right
+     :counter [right-counter props]
+     :action  [right-action props]
+     :tag     [right-tag props]
+     nil)])
@@ -96,7 +96,7 @@

 (defn- user-account
  [{:keys [name balance percentage-value loading? amount customization-color type emoji metrics?
-           on-press]}]
+           on-press on-long-press]}]
  (let [theme                  (quo.theme/use-theme)
        [pressed? set-pressed] (rn/use-state false)
        on-press-in            (rn/use-callback #(set-pressed true))
@@ -110,14 +110,15 @@
        :theme               theme
        :metrics?            metrics?}]
      [rn/pressable
-       {:on-press-in  on-press-in
-        :on-press-out on-press-out
-        :style        (style/card {:customization-color customization-color
-                                   :type                type
-                                   :theme               theme
-                                   :pressed?            pressed?
-                                   :metrics?            metrics?})
-        :on-press     on-press}
+       {:on-long-press on-long-press
+        :on-press-in   on-press-in
+        :on-press-out  on-press-out
+        :style         (style/card {:customization-color customization-color
+                                    :type                type
+                                    :theme               theme
+                                    :pressed?            pressed?
+                                    :metrics?            metrics?})
+        :on-press      on-press}
       (when (and customization-color (and (not watch-only?) (not missing-keypair?)))
         [customization-colors/overlay
          {:customization-color customization-color
@@ -92,36 +92,36 @@
                                        (oops/oget "nativeEvent.selection")
                                        (js->clj :keywordize-keys true)
                                        (on-selection-change))))]
-    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?
-                 selection]
+    (fn [{:keys [token customization-color show-keyboard? crypto? currency value error? selection]
          :or   {show-keyboard? true}}]
-      [rn/view {:style {:flex 1}}
-       [rn/pressable {:on-press on-token-press}
-        [token/view
-         {:token token
-          :size  :size-32}]]
-       [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
-                  :max-length               12
-                  :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)}
-           controlled-input?       (assoc :value value)
-           (not controlled-input?) (assoc :default-value value-internal))]]
-       [token-label
-        {:theme theme
-         :text  (if crypto? token currency)
-         :value (if controlled-input? value value-internal)}]])))
+      (let [theme (quo.theme/use-theme)]
+        [rn/view {:style {:flex 1}}
+         [rn/pressable {:on-press on-token-press}
+          [token/view
+           {:token token
+            :size  :size-32}]]
+         [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
+                    :max-length               12
+                    :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)}
+             controlled-input?       (assoc :value value)
+             (not controlled-input?) (assoc :default-value value-internal))]]
+         [token-label
+          {:theme theme
+           :text  (if crypto? token currency)
+           :value (if controlled-input? value value-internal)}]]))))

 (defn- view-internal
  [{:keys [container-style value on-swap] :as props}]
@@ -139,6 +139,7 @@
      [input-section
       (assoc props
              :value-internal     value-internal
+              :theme              theme
              :set-value-internal set-value-internal
              :crypto?            crypto?)]
      [button/button
@@ -66,52 +66,53 @@

 (defn- view-info-bottom
  [{:keys [state time-frame metrics date begin-date end-date
-           currency-change percentage-change theme]}]
-  [rn/view {:style style/container-info-bottom}
-   (when (= state :loading)
-     [rn/view
-      {:style {:flex-direction :row
-               :align-items    :center}}
-      (loading-bars [{:width 32 :height 10 :margin 8}
-                     {:width 32 :height 10 :margin 2}
-                     {:width 62 :height 10 :margin 4}
-                     {:width 10 :height 10 :margin 0}]
-                    theme)])
-   (when (and (= state :default) (= time-frame :selected))
-     [text/text
-      {:weight :medium
-       :size   :paragraph-2
-       :style  (style/style-text-paragraph theme)}
-      date])
-   (when (and (= state :default) (= time-frame :custom))
-     [rn/view {:style {:flex-direction :row}}
-      [text/text
-       {:weight :medium
-        :size   :paragraph-2
-        :style  (style/style-text-paragraph theme)}
-       begin-date]
-      [icon/icon :i/positive-right
-       {:color (style/color-text-paragraph theme)
-        :size  16}]
-      [text/text
-       {:weight :medium
-        :size   :paragraph-2
-        :style  (style/style-text-paragraph theme)}
-       end-date]])
-   (when (and (= state :default) (not (#{:none :selected} time-frame)))
-     [rn/view {:style {:flex-direction :row}}
-      [text/text
-       {:weight :medium
-        :size   :paragraph-2
-        :style  {:color        (style/color-text-paragraph theme)
-                 :margin-right 8}}
-       (time-frame time-frames)]
-      (when (and (= state :default) (not= metrics :none))
-        [view-metrics
-         {:metrics           metrics
-          :currency-change   currency-change
-          :percentage-change percentage-change
-          :theme             theme}])])])
+           currency-change percentage-change]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style style/container-info-bottom}
+     (when (= state :loading)
+       [rn/view
+        {:style {:flex-direction :row
+                 :align-items    :center}}
+        (loading-bars [{:width 32 :height 10 :margin 8}
+                       {:width 32 :height 10 :margin 2}
+                       {:width 62 :height 10 :margin 4}
+                       {:width 10 :height 10 :margin 0}]
+                      theme)])
+     (when (and (= state :default) (= time-frame :selected))
+       [text/text
+        {:weight :medium
+         :size   :paragraph-2
+         :style  (style/style-text-paragraph theme)}
+        date])
+     (when (and (= state :default) (= time-frame :custom))
+       [rn/view {:style {:flex-direction :row}}
+        [text/text
+         {:weight :medium
+          :size   :paragraph-2
+          :style  (style/style-text-paragraph theme)}
+         begin-date]
+        [icon/icon :i/positive-right
+         {:color (style/color-text-paragraph theme)
+          :size  16}]
+        [text/text
+         {:weight :medium
+          :size   :paragraph-2
+          :style  (style/style-text-paragraph theme)}
+         end-date]])
+     (when (and (= state :default) (not (#{:none :selected} time-frame)))
+       [rn/view {:style {:flex-direction :row}}
+        [text/text
+         {:weight :medium
+          :size   :paragraph-2
+          :style  {:color        (style/color-text-paragraph theme)
+                   :margin-right 8}}
+         (time-frame time-frames)]
+        (when (and (= state :default) (not= metrics :none))
+          [view-metrics
+           {:metrics           metrics
+            :currency-change   currency-change
+            :percentage-change percentage-change
+            :theme             theme}])])]))

 (defn- view-internal
  [props]
@@ -1,7 +0,0 @@
-(ns react-native.mail
-  (:require
-    ["react-native-mail" :default react-native-mail]))
-
-(defn mail
-  [opts callback]
-  (.mail react-native-mail (clj->js opts) callback))
@@ -0,0 +1,94 @@
+(ns status-im.common.controlled-input.utils
+  (:require
+    [clojure.string :as string]))
+
+(def init-state
+  {:value       ""
+   :error?      false
+   :upper-limit nil})
+
+(defn input-value
+  [state]
+  (:value state))
+
+(defn numeric-value
+  [state]
+  (or (parse-double (input-value state)) 0))
+
+(defn input-error
+  [state]
+  (:error? state))
+
+(defn- set-input-error
+  [state error?]
+  (assoc state :error? error?))
+
+(defn- upper-limit
+  [state]
+  (:upper-limit state))
+
+(defn upper-limit-exceeded?
+  [state]
+  (and
+   (upper-limit state)
+   (> (numeric-value state) (upper-limit state))))
+
+(defn- recheck-errorness
+  [state]
+  (set-input-error state (upper-limit-exceeded? state)))
+
+(defn- set-input-value
+  [state value]
+  (-> state
+      (assoc :value value)
+      recheck-errorness))
+
+(defn set-upper-limit
+  [state limit]
+  (-> state
+      (assoc :upper-limit limit)
+      recheck-errorness))
+
+(def ^:private not-digits-or-dot-pattern
+  #"[^0-9+\.]")
+
+(def ^:private dot ".")
+
+(defn- can-add-character?
+  [state character]
+  (let [max-length          12
+        current             (input-value state)
+        length-overflow?    (>= (count current) max-length)
+        extra-dot?          (and (= character dot) (string/includes? current dot))
+        extra-leading-zero? (and (= current "0") (= "0" (str character)))
+        non-numeric?        (re-find not-digits-or-dot-pattern (str character))]
+    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
+
+(defn- normalize-value-as-numeric
+  [value character]
+  (cond
+    (and (string/blank? value) (= character dot))
+    (str "0" character)
+
+    (and (= value "0") (not= character dot))
+    (str character)
+
+    :else
+    (str value character)))
+
+(defn add-character
+  [state character]
+  (when (can-add-character? state character)
+    (set-input-value state
+                     (normalize-value-as-numeric (input-value state) character))))
+
+(defn delete-last
+  [state]
+  (let [value     (input-value state)
+        new-value (subs value 0 (dec (count value)))]
+    (set-input-value state new-value)))
+
+(defn delete-all
+  [state]
+  (set-input-value state ""))
+
@@ -94,30 +94,31 @@
    :container-style style/empty-results}])

 (defn- render-list
-  [{:keys [theme filtered-data on-viewable-items-changed scroll-enabled? on-scroll
+  [{:keys [filtered-data on-viewable-items-changed scroll-enabled? on-scroll
           on-select set-scroll-ref close sheet-animating?]}]
-  [gesture/flat-list
-   {:ref                             set-scroll-ref
-    :scroll-enabled                  @scroll-enabled?
-    :data                            (or filtered-data emoji-picker.data/flatten-data)
-    :initial-num-to-render           14
-    :max-to-render-per-batch         10
-    :render-fn                       render-item
-    :get-item-layout                 get-item-layout
-    :keyboard-dismiss-mode           :on-drag
-    :keyboard-should-persist-taps    :handled
-    :shows-vertical-scroll-indicator false
-    :on-scroll-to-index-failed       identity
-    :empty-component                 [empty-result]
-    :on-scroll                       on-scroll
-    :render-data                     {:close     close
-                                      :theme     theme
-                                      :on-select on-select}
-    :content-container-style         style/list-container
-    :viewability-config              {:item-visible-percent-threshold 100
-                                      :minimum-view-time              200}
-    :on-viewable-items-changed       on-viewable-items-changed
-    :window-size                     (if @sheet-animating? 1 10)}])
+  (let [theme (quo.theme/use-theme)]
+    [gesture/flat-list
+     {:ref                             set-scroll-ref
+      :scroll-enabled                  @scroll-enabled?
+      :data                            (or filtered-data emoji-picker.data/flatten-data)
+      :initial-num-to-render           14
+      :max-to-render-per-batch         10
+      :render-fn                       render-item
+      :get-item-layout                 get-item-layout
+      :keyboard-dismiss-mode           :on-drag
+      :keyboard-should-persist-taps    :handled
+      :shows-vertical-scroll-indicator false
+      :on-scroll-to-index-failed       identity
+      :empty-component                 [empty-result]
+      :on-scroll                       on-scroll
+      :render-data                     {:close     close
+                                        :theme     theme
+                                        :on-select on-select}
+      :content-container-style         style/list-container
+      :viewability-config              {:item-visible-percent-threshold 100
+                                        :minimum-view-time              200}
+      :on-viewable-items-changed       on-viewable-items-changed
+      :window-size                     (if @sheet-animating? 1 10)}]))

 (defn- footer
  [{:keys [active-category scroll-ref]}]
@@ -127,7 +127,7 @@
                  :context             item
                  :accessibility-label :block-user
                  :button-text         (i18n/label :t/block-user)
-                  :on-press            #(hide-sheet-and-dispatch [:contact.ui/block-contact-confirmed
+                  :on-press            #(hide-sheet-and-dispatch [:contact/block-contact
                                                                  public-key])}])}]))

 (defn mute-chat-entry
@@ -35,7 +35,7 @@
     {:avatar-on-press          #(rf/dispatch [:open-modal :settings])
      :scan-on-press            #(rf/dispatch [:open-modal :shell-qr-reader])
      :activity-center-on-press #(rf/dispatch [:activity-center/open])
-      :qr-code-on-press         #(rf/dispatch [:open-modal :share-shell])
+      :qr-code-on-press         #(rf/dispatch [:open-modal :screen/share-shell])
      :container-style          (merge style/top-nav-container container-style)
      :blur?                    blur?
      :jump-to?                 jump-to?
@@ -3,7 +3,6 @@
            [oops.core :as oops]
            [quo.core :as quo]
            [quo.foundations.colors :as colors]
-            [quo.theme :as quo.theme]
            [react-native.blur :as blur]
            [react-native.camera-kit :as camera-kit]
            [react-native.core :as rn]
@@ -31,7 +30,17 @@
      :size                32
      :accessibility-label :close-scan-qr-code
      :on-press            #(rf/dispatch [:navigate-back])}
-     :i/arrow-left]]
+     :i/close]
+    [quo/button
+     {:icon-only?          true
+      :type                :grey
+      :background          :blur
+      :size                32
+      :accessibility-label :show-qr-button
+      :on-press            (fn []
+                             (rf/dispatch [:navigate-back])
+                             (rf/dispatch [:open-modal :screen/share-shell]))}
+     :i/qr-code]]
   [quo/text
    {:size   :heading-1
     :weight :semi-bold
@@ -171,8 +180,8 @@
     {:style            style/absolute-fill
      :blur-amount      10
      :blur-type        :transparent
-      :overlay-color    colors/neutral-80-opa-80
-      :background-color colors/neutral-80-opa-80}]]])
+      :overlay-color    colors/neutral-80-opa-80-blur
+      :background-color colors/neutral-80-opa-80-blur}]]])

 (defn- set-listener-torch-off-on-app-inactive
  [torch-atm]
@@ -234,16 +243,15 @@
            [:<>
             [rn/view {:style style/scan-qr-code-container}]
             [qr-scan-hole-area qr-view-finder]])
-          [scan-qr-code-tab @qr-view-finder (when subtitle true)]
+          [scan-qr-code-tab @qr-view-finder true]
          [rn/view {:style style/flex-spacer}]
          (when show-camera?
-            [quo.theme/provider :light
-             [quo/button
-              {:icon-only?          true
-               :type                :grey
-               :background          :photo
-               :size                style/flash-button-size
-               :accessibility-label :camera-flash
-               :container-style     (style/camera-flash-button @qr-view-finder)
-               :on-press            #(swap! torch? not)}
-              flashlight-icon]])]]))))
+            [quo/button
+             {:icon-only?          true
+              :type                :grey
+              :background          :photo
+              :size                style/flash-button-size
+              :accessibility-label :camera-flash
+              :container-style     (style/camera-flash-button @qr-view-finder)
+              :on-press            #(swap! torch? not)}
+             flashlight-icon])]]))))
@@ -101,50 +101,52 @@
 (defn scroll-page
  [_ _ _]
  (let [scroll-height (reagent/atom negative-scroll-position-0)]
-    (fn [{:keys [theme cover-image cover-color logo on-scroll
+    (fn [{:keys [cover-image cover-color logo on-scroll
                 collapsed? height top-nav title-colum background-color navigate-back? page-nav-props
                 overlay-shown? sticky-header children-style]}
         children]
-      [:<>
-       [:f> f-scroll-page-header
-        {:scroll-height  @scroll-height
-         :height         height
-         :sticky-header  sticky-header
-         :top-nav        top-nav
-         :title-colum    title-colum
-         :navigate-back? navigate-back?
-         :collapsed?     collapsed?
-         :page-nav-props page-nav-props
-         :overlay-shown? overlay-shown?}]
-       [rn/scroll-view
-        {:content-container-style           {:flex-grow 1}
-         :content-inset-adjustment-behavior :never
-         :shows-vertical-scroll-indicator   false
-         :scroll-event-throttle             16
-         :on-scroll                         (fn [^js event]
-                                              (reset! scroll-height (int
-                                                                     (oops/oget
-                                                                      event
-                                                                      "nativeEvent.contentOffset.y")))
-                                              (when on-scroll
-                                                (on-scroll @scroll-height)))}
-        (when cover-color
-          [rn/view {:style (style/cover-background cover-color)}])
-        (when cover-image
-          [rn/view {:style {:height (if collapsed? 110 151)}}
-           [rn/image
-            {:source cover-image
-             ;; Using negative margin-bottom as a workaround because on Android,
-             ;; ScrollView clips its children despite setting overflow: 'visible'.
-             ;; Related issue: https://github.com/facebook/react-native/issues/31218
-             :style  {:margin-bottom -16
-                      :flex          1}}]])
-        (when children
-          [rn/view
-           {:style (style/children-container (merge
-                                              children-style
-                                              {:border-radius    (diff-with-max-min @scroll-height 16 0)
-                                               :background-color background-color}))}
-           (when (and (not collapsed?) cover-image)
-             [:f> f-display-picture @scroll-height logo theme])
-           children])]])))
+      (let [theme (quo.theme/use-theme)]
+        [:<>
+         [:f> f-scroll-page-header
+          {:scroll-height  @scroll-height
+           :height         height
+           :sticky-header  sticky-header
+           :top-nav        top-nav
+           :title-colum    title-colum
+           :navigate-back? navigate-back?
+           :collapsed?     collapsed?
+           :page-nav-props page-nav-props
+           :overlay-shown? overlay-shown?}]
+         [rn/scroll-view
+          {:content-container-style           {:flex-grow 1}
+           :content-inset-adjustment-behavior :never
+           :shows-vertical-scroll-indicator   false
+           :scroll-event-throttle             16
+           :on-scroll                         (fn [^js event]
+                                                (reset! scroll-height (int
+                                                                       (oops/oget
+                                                                        event
+                                                                        "nativeEvent.contentOffset.y")))
+                                                (when on-scroll
+                                                  (on-scroll @scroll-height)))}
+          (when cover-color
+            [rn/view {:style (style/cover-background cover-color)}])
+          (when cover-image
+            [rn/view {:style {:height (if collapsed? 110 151)}}
+             [rn/image
+              {:source cover-image
+               ;; Using negative margin-bottom as a workaround because on Android,
+               ;; ScrollView clips its children despite setting overflow: 'visible'.
+               ;; Related issue: https://github.com/facebook/react-native/issues/31218
+               :style  {:margin-bottom -16
+                        :flex          1}}]])
+          (when children
+            [rn/view
+             {:style (style/children-container
+                      (merge
+                       children-style
+                       {:border-radius    (diff-with-max-min @scroll-height 16 0)
+                        :background-color background-color}))}
+             (when (and (not collapsed?) cover-image)
+               [:f> f-display-picture @scroll-height logo theme])
+             children])]]))))
@@ -35,6 +35,7 @@
  (let [^js data     (.parse js/JSON event-str)
        ^js event-js (.-event data)
        type         (.-type data)]
+    (log/debug "Signal received" event-str)
    (case type
      "node.login"                 {:fx [[:dispatch
                                          [:profile.login/login-node-signal
@@ -19,7 +19,7 @@
                     (update :toasts dissoc :hide-toasts-timer-set))}

      (and (not update?) (= (count ordered) 1))
-      (assoc :show-toasts [(:view-id db) (:theme db)])
+      (assoc :show-toasts [(:view-id db) (or (:theme opts) (:theme db))])

      (not (:id opts))
      (update-in [:db :toasts :next-toast-number] inc))))
@@ -214,6 +214,7 @@
 (def regx-string-public-key "0x04[0-9a-f]{128}")
 (def regx-compressed-key (re-pattern (str "^" regx-string-compressed-key "$")))
 (def regx-public-key (re-pattern (str "^" regx-string-public-key "$")))
+(def regx-private-key #"^0x[0-9a-fA-F]{64}$")
 (def regx-emoji
  #"^((?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC69\uDC6E\uDC70-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD18-\uDD1C\uDD1E\uDD1F\uDD26\uDD30-\uDD39\uDD3D\uDD3E\uDDD1-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])?|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDEEB\uDEEC\uDEF4-\uDEF8]|\uD83E[\uDD10-\uDD3A\uDD3C-\uDD3E\uDD40-\uDD45\uDD47-\uDD4C\uDD50-\uDD6B\uDD80-\uDD97\uDDC0\uDDD0-\uDDE6])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEF8]|\uD83E[\uDD10-\uDD3A\uDD3C-\uDD3E\uDD40-\uDD45\uDD47-\uDD4C\uDD50-\uDD6B\uDD80-\uDD97\uDDC0\uDDD0-\uDDE6])\uFE0F|[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF])+$")
 (def regx-bold #"\*[^*]+\*")
@@ -131,20 +131,3 @@
                    :js-response true
                    :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])
                    :on-error    #(log/error "failed to set contact nickname " public-key nickname %)}]})
-
-(rf/defn block
-  [_ contact-id on-success]
-  {:json-rpc/call [{:method      "wakuext_blockContact"
-                    :params      [contact-id]
-                    :js-response true
-                    :on-success  on-success
-                    :on-error    #(log/error "failed to block contact" % contact-id)}]})
-
-(rf/defn unblock
-  [_ contact-id on-success]
-  {:json-rpc/call [{:method      "wakuext_unblockContact"
-                    :params      [contact-id]
-                    :on-success  on-success
-                    :js-response true
-                    :on-error    #(log/error "failed to unblock contact" % contact-id)}]})
-
@@ -6,7 +6,6 @@
    [status-im.contexts.chat.contacts.events :as data-store.contacts]
    status-im.contexts.chat.home.add-new-contact.effects
    [utils.ens.stateofus :as stateofus]
-    [utils.ethereum.chain :as chain]
    [utils.string :as utils.string]))

 (defn init-contact
@@ -115,8 +114,7 @@
                                                :failure-fn failure-fn}])}}
      :resolve-ens      {:db (assoc db :contacts/new-identity contact)
                         :effects.contacts/resolve-public-key-from-ens
-                         {:chain-id (chain/chain-id db)
-                          :ens ens
+                         {:ens ens
                          :on-success
                          #(re-frame/dispatch [:contacts/set-new-identity-success
                                               {:input            input
@@ -85,10 +85,7 @@

 (def db
  {:profile/profile          {:public-key user-ukey}
-   :networks/current-network "mainnet_rpc"
-   :networks/networks        {"mainnet_rpc"
-                              {:id     "mainnet_rpc"
-                               :config {:NetworkId 1}}}})
+   :networks/current-network "mainnet_rpc"})

 (deftest set-new-identity-test
  (with-redefs [re-frame/dispatch (fn [& args] args)]
@@ -120,8 +117,7 @@
                             :scanned         ens
                             :state           :resolve-ens}))
                :effects.contacts/resolve-public-key-from-ens
-                {:chain-id   1
-                 :ens        ens-stateofus-eth
+                {:ens        ens-stateofus-eth
                 :on-success [:contacts/set-new-identity-success ens]
                 :on-error   [:contacts/set-new-identity-error ens]}}

@@ -7,10 +7,8 @@

 (defn initialize-permission-addresses
  [{:keys [db]} [community-id]]
-  (let [{:keys [joined]}              (get-in db [:communities community-id])
-        pending-requests              (get-in db [:communities/my-pending-requests-to-join community-id])
-        init-using-revealed-accounts? (or joined (seq pending-requests))]
-    {:fx [(if init-using-revealed-accounts?
+  (let [{:keys [joined]} (get-in db [:communities community-id])]
+    {:fx [(if joined
            [:dispatch
             [:communities/get-revealed-accounts community-id
              [:communities/do-init-permission-addresses community-id]]]
@@ -36,25 +36,15 @@
    :reveal?          false}])

 (deftest initialize-permission-addresses-test
-  (testing "fetches revealed accounts when pending and not joined"
-    (let [cofx {:db {:communities                             {community-id {:joined false}}
-                     :communities/my-pending-requests-to-join {community-id [:anything]}}}]
+  (testing "fetches revealed accounts when joined"
+    (let [cofx {:db {:communities {community-id {:joined true}}}}]
      (is (match?
           {:fx [[:dispatch
                  [:communities/get-revealed-accounts community-id
                   [:communities/do-init-permission-addresses community-id]]]]}
           (sut/initialize-permission-addresses cofx [community-id])))))

-  (testing "fetches revealed accounts when not pending and joined"
-    (let [cofx {:db {:communities                             {community-id {:joined true}}
-                     :communities/my-pending-requests-to-join {}}}]
-      (is (match?
-           {:fx [[:dispatch
-                  [:communities/get-revealed-accounts community-id
-                   [:communities/do-init-permission-addresses community-id]]]]}
-           (sut/initialize-permission-addresses cofx [community-id])))))
-
-  (testing "does not fetch revealed accounts when not pending and not joined"
+  (testing "does not fetch revealed accounts when not joined"
    (let [cofx {:db {:communities                             {community-id {:joined false}}
                     :communities/my-pending-requests-to-join {}}}]
      (is (match?
@@ -68,7 +68,8 @@
                                    [:communities/request-to-join-with-addresses
                                     {:community-id id
                                      :password     password}]))}])
-           (navigate-back)))
+           (navigate-back))
+         [can-edit-addresses?])

        open-permission-sheet
        (rn/use-callback (fn []
@@ -40,34 +40,6 @@
             :token         (:symbol balance)
             :token-img-src (images-by-symbol sym)))))

-(defn- cancel-join-request-drawer
-  [community-id]
-  (let [{:keys [name logo color]} (rf/sub [:communities/for-context-tag community-id])
-        request-id                (rf/sub [:communities/my-pending-request-to-join community-id])]
-    [:<>
-     [quo/drawer-top
-      {:type                :context-tag
-       :context-tag-type    :community
-       :title               (i18n/label :t/cancel-request?)
-       :community-name      name
-       :community-logo      logo
-       :customization-color color}]
-     [rn/view {:style style/drawer-body}
-      [quo/text (i18n/label :t/pending-join-request-farewell)]]
-     [quo/bottom-actions
-      {:actions          :two-actions
-
-       :button-one-label (i18n/label :t/confirm-and-cancel)
-       :button-one-props {:customization-color color
-                          :on-press
-                          (fn []
-                            (rf/dispatch [:communities/addresses-for-permissions-cancel-request
-                                          request-id]))}
-
-       :button-two-label (i18n/label :t/cancel)
-       :button-two-props {:type     :grey
-                          :on-press #(rf/dispatch [:hide-bottom-sheet])}}]]))
-
 (defn- confirm-discard-drawer
  [community-id]
  (let [{:keys [name logo color]} (rf/sub [:communities/for-context-tag community-id])]
@@ -206,11 +178,6 @@
        joined (rf/sub [:communities/community-joined id])
        checking? (rf/sub [:communities/permissions-check-for-selection-checking? id])

-        cancel-join-request
-        (rn/use-callback
-         (fn []
-           (rf/dispatch [:show-bottom-sheet
-                         {:content (fn [] [cancel-join-request-drawer id])}])))
        leave-community
        (rn/use-callback
         (fn []
@@ -237,7 +204,6 @@
                                                         (rf/dispatch [:hide-bottom-sheet]))}]))}])
              (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses]))
            (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal])))
-        pending? (rf/sub [:communities/has-pending-request-to-join? id])
        highest-role (rf/sub [:communities/highest-role-for-selection id])
        [unmodified-role _] (rn/use-state highest-role)]

@@ -255,38 +221,20 @@
       can-edit-addresses?
       (->
         (assoc :actions              :one-action
-                :button-one-label     (cond
-                                        (and pending? (not highest-role))
-                                        (i18n/label :t/cancel-request)
-
-                                        (and joined (not highest-role))
+                :button-one-label     (if (and joined (not highest-role))
                                        (i18n/label :t/leave-community)
-
-                                        :else
                                        (i18n/label :t/confirm-changes))
                :description-top-text (cond
-                                        (and pending? highest-role)
-                                        (i18n/label :t/eligible-to-join-as)
-
                                        (and joined (= highest-role unmodified-role))
                                        (i18n/label :t/you-are-a)

                                        (and joined (not= highest-role unmodified-role))
                                        (i18n/label :t/you-will-be-a))
-                :error-message        (cond
-                                        (and pending? (not highest-role))
-                                        (i18n/label :t/community-join-requirements-not-met)
-
-                                        (and joined (not highest-role))
+                :error-message        (when (and joined (not highest-role))
                                        (i18n/label :t/membership-requirements-not-met)))
         (update :button-one-props
                 merge
-                 (cond (and pending? (not highest-role))
-                       {:type      :danger
-                        :disabled? false
-                        :on-press  cancel-join-request}
-
-                       (and joined (not highest-role))
+                 (cond (and joined (not highest-role))
                       {:type      :danger
                        :disabled? false
                        :on-press  leave-community})))
@@ -372,13 +320,8 @@
       :data                    wallet-accounts}]

     [selection-bottom-actions id
-      {:flag-share-all-addresses
-       flag-share-all-addresses
-       :addresses-to-reveal
-       addresses-to-reveal
-       :cancel-selection
-       cancel-selection
-       :can-edit-addresses?
-       can-edit-addresses?
-       :identical-choices?
-       identical-choices?}]]))
+      {:flag-share-all-addresses flag-share-all-addresses
+       :addresses-to-reveal      addresses-to-reveal
+       :cancel-selection         cancel-selection
+       :can-edit-addresses?      can-edit-addresses?
+       :identical-choices?       identical-choices?}]]))
@@ -131,25 +131,22 @@
                                                         request-id])}])})

 (defn not-joined-options
-  [id token-gated? pending? intro-message]
+  [id token-gated? intro-message]
  [[(when-not token-gated? (view-members id))
    (when-not token-gated? (view-rules id intro-message))
    (invite-contacts id)
    (when token-gated? (view-token-gating id))
-    (when (and pending? (ff/enabled? ::ff/community.edit-account-selection))
-      (edit-shared-addresses id))
    (show-qr id)
    (share-community id)]])

 (defn join-request-sent-options
  [id token-gated? request-id intro-message]
-  [(conj (first (not-joined-options id token-gated? request-id intro-message))
+  [(conj (first (not-joined-options id token-gated? intro-message))
         (assoc (cancel-request-to-join id request-id) :add-divider? true))])

 (defn banned-options
  [id token-gated? intro-message]
-  (let [pending? false]
-    (not-joined-options id token-gated? pending? intro-message)))
+  (not-joined-options id token-gated? intro-message))

 (defn joined-options
  [id token-gated? muted? muted-till color intro-message]
@@ -189,7 +186,7 @@
      joined     (joined-options id role-permissions? muted muted-till color intro-message)
      request-id (join-request-sent-options id role-permissions? request-id intro-message)
      banList    (banned-options id role-permissions? intro-message)
-      :else      (not-joined-options id role-permissions? request-id intro-message))))
+      :else      (not-joined-options id role-permissions? intro-message))))

 (defn community-options-bottom-sheet
  [id]
@@ -209,8 +209,7 @@
        featured-communities-count (count featured-communities)]
    (fn []
      [scroll-page/scroll-page
-       {:theme            theme
-        :on-scroll        #(reset! scroll-height %)
+       {:on-scroll        #(reset! scroll-height %)
        :page-nav-props   {:background :blur}
        :navigate-back?   :true
        :height           (if (> @scroll-height 360)
@@ -374,9 +374,8 @@
 (defn get-revealed-accounts
  [{:keys [db]} [community-id on-success]]
  (let [{:keys [joined fetching-revealed-accounts]
-         :as   community} (get-in db [:communities community-id])
-        pending?          (get-in db [:communities/my-pending-requests-to-join community-id])]
-    (when (and community (or pending? joined) (not fetching-revealed-accounts))
+         :as   community} (get-in db [:communities community-id])]
+    (when (and community joined (not fetching-revealed-accounts))
      {:db (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
       :json-rpc/call
       [{:method      "wakuext_getRevealedAccounts"
@@ -167,26 +167,7 @@
                    (:db effects)))
        (is (match? {:method "wakuext_getRevealedAccounts"
                     :params [community-id "profile-public-key"]}
-                    (-> effects :json-rpc/call first (select-keys [:method :params]))))))
-
-    (testing "given there is a pending request"
-      (let [pub-key    "profile-public-key"
-            community  (assoc community :joined false)
-            db         {:communities                             {community-id community}
-                        :profile/profile                         {:public-key pub-key}
-                        :communities/my-pending-requests-to-join {community-id [:anything]}}
-            on-success [:some-event-id]
-            actual     (events/get-revealed-accounts {:db db} [community-id on-success])
-            expected   {:db            (assoc-in db
-                                        [:communities community-id :fetching-revealed-accounts]
-                                        true)
-                        :json-rpc/call [{:method      "wakuext_getRevealedAccounts"
-                                         :params      [community-id pub-key]
-                                         :js-response true
-                                         :on-success  [:communities/get-revealed-accounts-success
-                                                       community-id on-success]
-                                         :on-error    fn?}]}]
-        (is (match? expected actual))))))
+                    (-> effects :json-rpc/call first (select-keys [:method :params]))))))))

 (deftest handle-community
  (let [community {:id community-id :clock 2}]
@@ -0,0 +1,85 @@
+(ns status-im.contexts.contact.blocking.events
+  (:require
+    [legacy.status-im.data-store.chats :as chats-store]
+    [re-frame.core :as re-frame]
+    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]
+    [utils.transforms :as transforms]))
+
+(rf/defn clean-up-chat
+  [{:keys [db]} public-key
+   {:keys [chat-id unviewed-messages-count unviewed-mentions-count last-message]}]
+  (let [ids (keep (fn [[message-id {:keys [from]}]]
+                    (when (= from public-key) message-id))
+                  (get-in db [:messages chat-id]))
+        db  (-> db
+                ;; remove messages
+                (update-in [:messages chat-id] #(apply dissoc % ids))
+                (update-in [:chats chat-id]
+                           assoc
+                           :unviewed-messages-count unviewed-messages-count
+                           :unviewed-mentions-count unviewed-mentions-count
+                           :last-message            last-message))]
+    {:db (assoc-in db
+          [:message-lists chat-id]
+          (message-list/add-many nil (vals (get-in db [:messages chat-id]))))}))
+
+(rf/defn contact-blocked
+  {:events [:contact/blocked]}
+  [{:keys [db] :as cofx} {:keys [public-key]} chats-js]
+  (let [fxs (when chats-js
+              (map #(->> (chats-store/<-rpc %)
+                         (clean-up-chat public-key))
+                   (transforms/js->clj chats-js)))]
+    (apply
+     rf/merge
+     cofx
+     {:db (-> db
+              (update :chats dissoc public-key)
+              (update :chats-home-list disj public-key)
+              (assoc-in [:contacts/contacts public-key :added?] false))
+      :fx [[:activity-center.notifications/fetch-unread-count]
+           [:effects/push-notifications-clear-message-notifications [public-key]]
+           [:dispatch-later
+            [{:ms       500
+              :dispatch [:chat.ui/close-and-remove-chat public-key]}]]]}
+     fxs)))
+
+(rf/reg-event-fx :contact/block-contact
+ (fn [{:keys [db]} [public-key]]
+   (let [contact               (-> (get (:contacts/contacts db) public-key {:public-key public-key})
+                                   (assoc :blocked? true
+                                          :added?   false
+                                          :active?  false))
+         current-chat-id       (:current-chat-id db)
+         from-one-to-one-chat? (not (get-in db [:chats current-chat-id :group-chat]))]
+     {:db (assoc-in db [:contacts/contacts public-key] contact)
+      :fx [[:json-rpc/call
+            [{:method      "wakuext_blockContact"
+              :params      [public-key]
+              :js-response true
+              :on-success  (fn [^js response]
+                             (re-frame/dispatch [:contact/blocked contact (.-chats response)])
+                             (re-frame/dispatch [:sanitize-messages-and-process-response response]))
+              :on-error    #(log/error "failed to block contact" % public-key)}]]
+           [:dispatch [:hide-popover]]
+           ;; reset navigation to avoid going back to non existing one to one chat
+           (when current-chat-id
+             (if from-one-to-one-chat?
+               [:dispatch [:pop-to-root :shell-stack]]
+               [:dispatch [:navigate-back]]))]})))
+
+(rf/reg-event-fx :contact/unblocked
+ (fn [{:keys [db]} [contact-id]]
+   {:db (update-in db
+                   [:contacts/contacts contact-id]
+                   #(assoc % :blocked? false :added true :active? true))}))
+
+(rf/reg-event-fx :contact/unblock-contact
+ (fn [_ [contact-id]]
+   {:json-rpc/call
+    [{:method     "wakuext_unblockContact"
+      :params     [contact-id]
+      :on-success #(re-frame/dispatch [:contact/unblocked contact-id])
+      :on-error   #(log/error "failed to unblock contact" % contact-id)}]}))
@@ -24,7 +24,7 @@
                                              :text (i18n/label :t/user-blocked
                                                                {:username
                                                                 full-name})}])
-                               (rf/dispatch [:contact.ui/block-contact-confirmed
+                               (rf/dispatch [:contact/block-contact
                                             public-key])
                               (rf/dispatch [:contact.ui/remove-contact-pressed
                                             {:public-key public-key}])
@@ -46,7 +46,7 @@
                                                            ens-name])
                                             [ens-name public-key])
        on-unblock-press    (rn/use-callback (fn []
-                                               (rf/dispatch [:contact.ui/unblock-contact-pressed
+                                               (rf/dispatch [:contact/unblock-contact
                                                             public-key])
                                               (rf/dispatch [:toasts/upsert
                                                             {:id   :user-unblocked
@@ -0,0 +1,52 @@
+(ns status-im.contexts.profile.contact.unblock-contact.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.contexts.profile.contact.block-contact.style :as style]
+            [status-im.contexts.profile.utils :as profile.utils]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn on-close [] (rf/dispatch [:hide-bottom-sheet]))
+
+(defn view
+  [contact]
+  (let [{:keys [customization-color
+                public-key]} contact
+        full-name            (profile.utils/displayed-name contact)
+        profile-picture      (profile.utils/photo contact)
+        on-unblock-press     (rn/use-callback
+                              (fn []
+                                (rf/dispatch [:toasts/upsert
+                                              {:id    :user-unblocked
+                                               :type  :positive
+                                               :theme :dark
+                                               :text  (i18n/label :t/user-unblocked
+                                                                  {:username
+                                                                   full-name})}])
+                                (rf/dispatch [:contact/unblock-contact
+                                              public-key])
+                                (on-close))
+                              [public-key full-name])]
+    [:<>
+     [quo/drawer-top
+      {:type                :context-tag
+       :context-tag-type    :default
+       :title               (i18n/label :t/unblock)
+       :full-name           full-name
+       :profile-picture     profile-picture
+       :customization-color customization-color}]
+     [rn/view {:style style/content-wrapper}
+      [quo/text
+       {:weight :medium
+        :size   :paragraph-1}
+       (i18n/label :t/unblocking-a-user-message {:username full-name})]]
+     [quo/bottom-actions
+      {:actions          :two-actions
+       :button-one-label (i18n/label :t/unblock)
+       :button-one-props {:type                :danger
+                          :accessibility-label :block-contact
+                          :on-press            on-unblock-press}
+       :button-two-label (i18n/label :t/cancel)
+       :button-two-props {:type                :grey
+                          :accessibility-label :cancel
+                          :on-press            on-close}}]]))
@@ -17,20 +17,18 @@
     :image       :icon
     :blur?       true
     :action      :arrow}]
-   [(when config/show-not-implemented-features?
-      {:title       (i18n/label :t/messages)
-       :on-press    not-implemented/alert
-       :image-props :i/messages
-       :image       :icon
-       :blur?       true
-       :action      :arrow})
-    (when config/show-not-implemented-features?
-      {:title       (i18n/label :t/wallet)
-       :on-press    not-implemented/alert
-       :image-props :i/wallet
-       :image       :icon
-       :blur?       true
-       :action      :arrow})
+   [{:title       (i18n/label :t/messages)
+     :on-press    #(rf/dispatch [:open-modal :screen/settings-messages])
+     :image-props :i/messages
+     :image       :icon
+     :blur?       true
+     :action      :arrow}
+    {:title       (i18n/label :t/wallet)
+     :on-press    #(rf/dispatch [:open-modal :screen/settings.wallet])
+     :image-props :i/wallet
+     :image       :icon
+     :blur?       true
+     :action      :arrow}
    (when config/show-not-implemented-features?
      {:title       (i18n/label :t/dapps)
       :on-press    not-implemented/alert
@@ -0,0 +1,43 @@
+(ns status-im.contexts.profile.settings.screens.messages.blocked-users.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.contact-list-item.view :as contact-list-item]
+            [status-im.contexts.profile.contact.unblock-contact.view :as unblock-contact]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn list-item
+  [user _ _ _]
+  [contact-list-item/contact-list-item
+   {:accessory {:type  :custom
+                :child [quo/button
+                        {:on-press            #(rf/dispatch [:show-bottom-sheet
+                                                             {:theme :dark
+                                                              :content
+                                                              (fn [] [unblock-contact/view user])}])
+                         :type                :outline
+                         :size                24
+                         :background          :blur
+                         :customization-color :blue}
+                        (i18n/label :t/unblock)]}}
+   user])
+
+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
+(defn view
+  []
+  (let [contacts (rf/sub [:contacts/blocked])]
+    [quo/overlay {:type :shell :top-inset? true}
+     [quo/page-nav
+      {:key        :header
+       :background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigate-back}]
+     [quo/page-top {:title (i18n/label :t/blocked-users)}]
+     [rn/flat-list
+      {:data                contacts
+       :key-fn              :key
+       :render-fn           list-item
+       :accessibility-label :contacts-list}]]))
@@ -0,0 +1,29 @@
+(ns status-im.contexts.profile.settings.screens.messages.view
+  (:require [quo.core :as quo]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
+(defn- open-blocked-users
+  []
+  (rf/dispatch [:open-modal :screen/settings-blocked-users]))
+
+(defn view
+  []
+  [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/messages)}]
+   [quo/category
+    {:label     (i18n/label :t/contacts)
+     :data      [{:title    (i18n/label :t/blocked-users)
+                  :on-press open-blocked-users
+                  :blur?    true
+                  :action   :arrow}]
+     :blur?     true
+     :list-type :settings}]])
@@ -1,12 +1,9 @@
 (ns status-im.contexts.profile.settings.screens.password.view
  (:require [quo.core :as quo]
            [quo.theme :as quo.theme]
-            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
            [status-im.common.biometric.utils :as biometric]
            [status-im.common.not-implemented :as not-implemented]
            [status-im.constants :as constants]
-            [status-im.contexts.profile.settings.screens.password.style :as style]
            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

@@ -56,27 +53,19 @@
   :image-props :i/password
   :action      :arrow})

+(defn- navigate-back
+  []
+  (rf/dispatch [:navigate-back]))
+
 (defn view
  []
-  (let [theme  (quo.theme/use-theme)
-        insets (safe-area/get-insets)]
-    [quo/overlay {:type :shell}
-     [rn/view
-      {:key   :navigation
-       :style (style/navigation (:top insets))}
-      [quo/page-nav
-       {:background :blur
-        :icon-name  :i/arrow-left
-        :on-press   #(rf/dispatch [:navigate-back])}]]
-     [rn/view
-      {:key   :header
-       :style style/header}
-      [quo/text
-       {:accessibility-label :password-settings-label
-        :weight              :semi-bold
-        :number-of-lines     1
-        :size                :heading-1}
-       (i18n/label :t/password)]]
+  (let [theme (quo.theme/use-theme)]
+    [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/password)}]
     [quo/category
      {:key       :category
       :data      [(get-biometric-item theme)
@@ -61,7 +61,8 @@
        :icon-name  :i/close
        :on-press   #(rf/dispatch [:navigate-back])
        :right-side [{:icon-name :i/qr-code
-                      :on-press  #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)}
+                      :on-press  #(debounce/throttle-and-dispatch [:open-modal :screen/share-shell]
+                                                                  1000)}
                     {:icon-name :i/share
                      :on-press  #(rf/dispatch [:open-share
                                                {:options {:message (:universal-profile-url
@@ -0,0 +1,14 @@
+(ns status-im.contexts.settings.wallet.saved-addresses.style)
+
+(def title-container
+  {:padding-horizontal 20
+   :margin-top         12})
+
+(defn page-wrapper
+  [inset-top]
+  {:padding-top inset-top
+   :flex        1})
+
+(def empty-container-style
+  {:justify-content :center
+   :flex            1})
@@ -0,0 +1,42 @@
+(ns status-im.contexts.settings.wallet.saved-addresses.view
+  (:require [quo.core :as quo]
+            [quo.theme :as quo.theme]
+            [react-native.core :as rn]
+            [react-native.safe-area :as safe-area]
+            [status-im.common.resources :as resources]
+            [status-im.contexts.settings.wallet.saved-addresses.style :as style]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn empty-state
+  []
+  (let [theme (quo.theme/use-theme)]
+    [quo/empty-state
+     {:title           (i18n/label :t/no-saved-addresses)
+      :description     (i18n/label :t/you-like-to-type-43-characters)
+      :image           (resources/get-themed-image :sweating-man theme)
+      :container-style style/empty-container-style}]))
+
+(defn view
+  []
+  (let [inset-top           (safe-area/get-top)
+        customization-color (rf/sub [:profile/customization-color])
+        saved-addresses     []
+        navigate-back       (rn/use-callback #(rf/dispatch [:navigate-back]))]
+    [quo/overlay
+     {:type            :shell
+      :container-style (style/page-wrapper inset-top)}
+     [quo/page-nav
+      {:key        :header
+       :background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigate-back}]
+     [rn/view {:style style/title-container}
+      [quo/standard-title
+       {:title               (i18n/label :t/saved-addresses)
+        :accessibility-label :saved-addresses-header
+        :right               :action
+        :customization-color customization-color
+        :icon                :i/add}]]
+     (when-not (seq saved-addresses)
+       [empty-state])]))
@@ -0,0 +1,5 @@
+(ns status-im.contexts.settings.wallet.wallet-options.style)
+
+(defn page-wrapper
+  [inset-top]
+  {:padding-top inset-top})
@@ -0,0 +1,45 @@
+(ns status-im.contexts.settings.wallet.wallet-options.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [react-native.safe-area :as safe-area]
+            [status-im.contexts.settings.wallet.wallet-options.style :as style]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn open-saved-addresses-settings-modal
+  []
+  (rf/dispatch [:open-modal :screen/settings.saved-addresses]))
+
+(defn gen-basic-settings-options
+  []
+  [{:title    (i18n/label :t/saved-addresses)
+    :blur?    true
+    :on-press open-saved-addresses-settings-modal
+    :action   :arrow}])
+
+(defn basic-settings
+  []
+  [quo/category
+   {:key       :basic-wallet-settings
+    :label     (i18n/label :t/keypairs-accounts-and-addresses)
+    :data      (gen-basic-settings-options)
+    :blur?     true
+    :list-type :settings}])
+
+(defn view
+  []
+  (let [inset-top     (safe-area/get-top)
+        navigate-back (rn/use-callback
+                       #(rf/dispatch [:navigate-back]))]
+    [quo/overlay
+     {:type            :shell
+      :container-style (style/page-wrapper inset-top)}
+     [quo/page-nav
+      {:key        :header
+       :background :blur
+       :icon-name  :i/arrow-left
+       :on-press   navigate-back}]
+     [quo/page-top
+      {:title                     (i18n/label :t/wallet)
+       :title-accessibility-label :wallet-settings-header}]
+     [basic-settings]]))
@@ -147,7 +147,7 @@
                          (:current-chat-id db))
                     (conj [:chat/close]))})
    {:db          (assoc db :view-id go-to-view-id)
-     :navigate-to go-to-view-id}))
+     :navigate-to [go-to-view-id (:theme db)]}))

 (rf/defn shell-navigate-back
  {:events [:shell/navigate-back]}
@@ -37,7 +37,12 @@
                 (h/is-truthy (h/query-by-text "0x707f635951193ddafbb40971a0fcaab8a6415160"))
                 (h/is-falsy (h/query-by-text "eth:"))))))

-  (h/test "should display the multichain account"
+  ;; NOTE: Fails with error below possibly due to Infura outage:
+  ;;    FAIL  ./status_im.contexts.shell.share.wallet.component_spec.js
+  ;;  ● share wallet addresses › should display the multichain account
+  ;;
+  ;;   No protocol method IDeref.-deref defined for type undefined
+  (h/test-skip "should display the multichain account"
    (render-wallet-view)
    (-> (h/wait-for #(h/get-by-label-text :share-qr-code-multichain-tab))
        (.then (fn []
@@ -0,0 +1,36 @@
+(ns status-im.contexts.wallet.add-account.create-account.import-private-key.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def input
+  {:margin-top         12
+   :padding-horizontal 20})
+
+(def indicator
+  {:padding-horizontal 20
+   :padding-vertical   8})
+
+(def info-box
+  {:margin-bottom 20})
+
+(def page-top
+  {:margin-top 2})
+
+(def key-section
+  {:margin-top         22
+   :padding-horizontal 20})
+
+(def section-label
+  {:margin-bottom 8})
+
+(defn public-address
+  [state theme]
+  (let [border-color (case state
+                       :active-address   (colors/resolve-color :success theme 40)
+                       :inactive-address (colors/resolve-color :warning theme 40)
+                       colors/neutral-20)]
+    {:border-width       1
+     :border-color       border-color
+     :border-style       :dashed
+     :border-radius      16
+     :padding-vertical   8
+     :padding-horizontal 12}))
@@ -0,0 +1,133 @@
+(ns status-im.contexts.wallet.add-account.create-account.import-private-key.view
+  (:require
+    [quo.core :as quo]
+    [quo.theme :as theme]
+    [react-native.clipboard :as clipboard]
+    [react-native.core :as rn]
+    [status-im.common.floating-button-page.view :as floating-button-page]
+    [status-im.contexts.wallet.add-account.create-account.import-private-key.style :as style]
+    [status-im.contexts.wallet.common.validation :as v]
+    [utils.debounce :as debounce]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
+
+(defn- address-input
+  [{:keys [input-value set-input-value set-flow-state error?]}]
+  (let [check-address (rn/use-callback
+                       (debounce/debounce (fn [v]
+                                            (if (empty? v)
+                                              (set-flow-state nil)
+                                              ;; TODO check for validation
+                                              (if-not (v/private-key? v)
+                                                (set-flow-state :invalid-private-key)
+                                                ;; TODO add real requests
+                                                (do
+                                                  (set-flow-state :scanning)
+                                                  (js/setTimeout
+                                                   set-flow-state
+                                                   400
+                                                   (rand-nth [:active-address :inactive-address]))))))
+                                          500))
+        on-change     (rn/use-callback
+                       (fn [v]
+                         (set-input-value v)
+                         (check-address v)))
+        on-paste      (rn/use-callback
+                       (fn []
+                         (clipboard/get-string
+                          (fn [clipboard]
+                            (when-not (empty? clipboard)
+                              (on-change clipboard))))))]
+    [quo/input
+     {:accessibility-label :add-address-to-watch
+      :placeholder         (i18n/label :t/enter-private-key-placeholder)
+      :container-style     style/input
+      :label               (i18n/label :t/private-key)
+      :type                :password
+      :error?              error?
+      :return-key-type     :done
+      :on-change-text      on-change
+      :button              (when (empty? input-value)
+                             {:on-press on-paste
+                              :text     (i18n/label :t/paste)})
+      :value               input-value}]))
+
+(defn- activity-indicator
+  [state]
+  (let [{:keys [message] :as props}
+        (case state
+          :scanning
+          {:type    :info
+           :icon    :i/scanning
+           :message :t/scanning-for-activity}
+
+          :inactive-address
+          {:type    :warning
+           :icon    :i/info
+           :message :t/this-account-has-no-activity}
+
+          :active-address
+          {:type    :success
+           :icon    :i/done
+           :message :t/this-address-has-activity}
+
+          :invalid-private-key
+          {:type    :error
+           :icon    :i/info
+           :message :t/invalid-private-key}
+
+          nil)]
+    (when props
+      [quo/info-message
+       (assoc props
+              :size  :default
+              :style style/indicator)
+       (i18n/label message)])))
+
+(defn view
+  []
+  (let [theme                         (theme/use-theme)
+        customization-color           (rf/sub [:profile/customization-color])
+        [input-value set-input-value] (rn/use-state "")
+        [flow-state set-flow-state]   (rn/use-state)
+        error?                        (= :invalid-private-key flow-state)]
+    [rn/view {:flex 1}
+     [floating-button-page/view
+      {:customization-color customization-color
+       :header              [quo/page-nav
+                             {:background :white
+                              :type       :no-title
+                              :icon-name  :i/close
+                              :on-press   #(rf/dispatch [:navigate-back])}]
+       :footer              [:<>
+                             (when-not (#{:active-address :inactive-address} flow-state)
+                               [quo/information-box
+                                {:type  :default
+                                 :icon  :i/info
+                                 :style style/info-box}
+                                (i18n/label :t/import-private-key-info)])
+                             [quo/button
+                              {:customization-color customization-color
+                               :disabled?           (or (empty? input-value) error?)
+                               :on-press            #()}
+                              (i18n/label :t/continue)]]}
+      [quo/page-top
+       {:container-style  style/page-top
+        :title            (i18n/label :t/import-private-key)
+        :description      :text
+        :description-text (i18n/label :t/enter-private-key)}]
+      [address-input
+       {:input-value     input-value
+        :set-input-value set-input-value
+        :set-flow-state  set-flow-state
+        :error?          error?}]
+      (when (#{:scanning :active-address :inactive-address} flow-state)
+        [rn/view {:style style/key-section}
+         [quo/section-label
+          {:section         (i18n/label :t/private-key-public-address)
+           :container-style style/section-label}]
+         ;; TODO Get real address
+         [rn/view {:style (style/public-address flow-state theme)}
+          [quo/text "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045"]]])
+      (when (seq input-value)
+        [activity-indicator flow-state])]]))
@@ -5,6 +5,7 @@
    [react-native.core :as rn]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.add-account.create-account.select-keypair.style :as style]
+    [status-im.feature-flags :as ff]
    [utils.address :as utils]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -22,7 +23,9 @@
      :add-divider?        true}
     {:icon                :i/key
      :accessibility-label :import-private-key
-      :label               (i18n/label :t/import-private-key)}]]])
+      :label               (i18n/label :t/import-private-key)
+      :on-press            (when (ff/enabled? ::wallet.import-private-key)
+                             #(rf/dispatch [:navigate-to :screen/wallet.import-private-key]))}]]])

 (defn- parse-accounts
  [given-accounts]
@@ -15,4 +15,5 @@
     :button-one-props  {:icon-left :i/bridge}
     :on-navigate-back  (fn []
                          (rf/dispatch [:wallet/clean-disabled-from-networks])
+                          (rf/dispatch [:wallet/clean-send-amount])
                          (rf/dispatch [:navigate-back]))}]])
@@ -3,3 +3,4 @@

 (defn ens-name? [s] (re-find constants/regx-ens s))
 (defn eth-address? [s] (re-find constants/regx-multichain-address s))
+(defn private-key? [s] (re-find constants/regx-private-key s))
@@ -26,10 +26,17 @@
              :type :positive
              :text (i18n/label :t/account-created {:name (:name account)})}]]]})))

+
+(defn set-current-viewing-account
+  [{:keys [db]} [address]]
+  {:db (assoc-in db [:wallet :current-viewing-account-address] address)})
+
+(rf/reg-event-fx :wallet/set-current-viewing-account set-current-viewing-account)
+
 (rf/reg-event-fx :wallet/navigate-to-account
- (fn [{:keys [db]} [address]]
-   {:db (assoc-in db [:wallet :current-viewing-account-address] address)
-    :fx [[:dispatch [:navigate-to :screen/wallet.accounts address]]]}))
+ (fn [_cofx [address]]
+   {:fx [[:dispatch [:wallet/set-current-viewing-account address]]
+         [:dispatch [:navigate-to :screen/wallet.accounts address]]]}))

 (rf/reg-event-fx :wallet/navigate-to-new-account
 (fn [{:keys [db]} [address]]
@@ -2,7 +2,9 @@
  (:require
    [quo.core :as quo]
    [react-native.core :as rn]
+    [react-native.platform :as platform]
    [status-im.common.home.top-nav.view :as common.top-nav]
+    [status-im.config :as config]
    [status-im.contexts.wallet.home.style :as style]
    [status-im.contexts.wallet.home.tabs.view :as tabs]
    [status-im.contexts.wallet.sheets.network-filter.view :as network-filter]
@@ -35,6 +37,82 @@
   {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
   {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}])

+(defn option
+  [{:keys [icon label on-press danger? sub-label add-divider? accessibility-label right-icon] :as opt}]
+  (when opt
+    ^{:key label}
+    {:icon                icon
+     :label               label
+     :on-press            on-press
+     :danger?             danger?
+     :sub-label           sub-label
+     :right-icon          right-icon
+     :add-divider?        add-divider?
+     :accessibility-label accessibility-label}))
+
+(defn options
+  [account-name address]
+  [(when config/show-not-implemented-features?
+     {:icon                :i/arrow-up
+      :label               (i18n/label :t/send-to-user {:user account-name})
+      :on-press            #(js/alert "TODO: to be implemented, requires design input")
+      :accessibility-label :manage-notifications})
+   (when config/show-not-implemented-features?
+     {:icon                :i/link
+      :right-icon          :i/external
+      :label               (i18n/label :t/view-address-on-website {:website "Etherscan"})
+      :on-press            #(js/alert "TODO: to be implemented, requires design input")
+      :accessibility-label :manage-notifications})
+   (when config/show-not-implemented-features?
+     {:icon                :i/link
+      :right-icon          :i/external
+      :label               (i18n/label :t/view-address-on-website {:website "Optimistic"})
+      :on-press            #(js/alert "TODO: to be implemented, requires design input")
+      :accessibility-label :manage-notifications})
+   {:icon                :i/share
+    :on-press            #(rf/dispatch
+                           [:open-share
+                            {:options (if platform/ios?
+                                        {:activityItemSources [{:placeholderItem {:type    :text
+                                                                                  :content address}
+                                                                :item            {:default {:type :text
+                                                                                            :content
+                                                                                            address}}
+                                                                :linkMetadata    {:title address}}]}
+                                        {:title     address
+                                         :subject   address
+                                         :message   address
+                                         :isNewTask true})}])
+    :label               (i18n/label :t/share-address)
+    :accessibility-label :manage-notifications}
+   {:icon                :i/qr-code
+    :label               (i18n/label :t/show-address-qr)
+    :on-press            (fn []
+                           (rf/dispatch [:wallet/set-current-viewing-account address])
+                           (rf/dispatch [:open-modal :screen/wallet.share-address {:status :share}]))
+    :accessibility-label :manage-notifications}
+   (when config/show-not-implemented-features?
+     {:icon                :i/edit
+      :label               (i18n/label :t/edit-account)
+      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.edit-account])
+      :accessibility-label :manage-notifications})
+   (when config/show-not-implemented-features?
+     {:icon                :i/delete
+      :label               (i18n/label :t/remove-account)
+      :on-press            #(js/alert "TODO: to be implemented, requires design input")
+      :danger?             true
+      :accessibility-label :manage-notifications
+      :add-divider?        true})])
+
+(defn sample-options
+  [account-name address]
+  (keep option (options account-name address)))
+
+(defn account-sheet
+  [{:keys [address] account-name :name}]
+  [quo/action-drawer
+   [(sample-options account-name address)]])
+
 (defn view
  []
  (let [[selected-tab set-selected-tab] (rn/use-state (:id (first tabs-data)))
@@ -69,7 +147,28 @@
       :data                              cards
       :horizontal                        true
       :separator                         [rn/view {:style style/separator}]
-       :render-fn                         (fn [item] [quo/account-card item])
+       :render-fn                         (fn [{:keys        [address ens-name color]
+                                                account-name :name
+                                                :as          item}]
+                                            (let [updated-item (assoc item
+                                                                      :on-long-press
+                                                                      (fn []
+                                                                        (rf/dispatch
+                                                                         [:show-bottom-sheet
+                                                                          {:selected-item
+                                                                           (fn []
+                                                                             [quo/saved-address
+                                                                              {:active-state? false
+                                                                               :user-props
+                                                                               {:name account-name
+                                                                                :address address
+                                                                                :ens ens-name
+                                                                                :customization-color
+                                                                                color}}])
+                                                                           :content (fn []
+                                                                                      [account-sheet
+                                                                                       item])}])))]
+                                              [quo/account-card updated-item]))
       :shows-horizontal-scroll-indicator false}]
     [quo/tabs
      {:style          style/tabs
@@ -76,6 +76,10 @@
 (fn [{:keys [db]}]
   {:db (update-in db [:wallet :ui :send] dissoc :recipient :to-address)}))

+(rf/reg-event-fx :wallet/clean-send-amount
+ (fn [{:keys [db]}]
+   {:db (update-in db [:wallet :ui :send] dissoc :amount)}))
+
 (rf/reg-event-fx :wallet/clean-disabled-from-networks
 (fn [{:keys [db]}]
   {:db (update-in db [:wallet :ui :send] dissoc :disabled-from-chain-ids)}))
@@ -86,7 +90,7 @@
   (let [[prefix to-address] (utils/split-prefix-and-address address)
         testnet-enabled?    (get-in db [:profile/profile :test-networks-enabled?])
         goerli-enabled?     (get-in db [:profile/profile :is-goerli-enabled?])
-         selected-networks   (network-utils/resolve-receiver-networks
+         receiver-networks   (network-utils/resolve-receiver-networks
                              {:prefix           prefix
                               :testnet-enabled? testnet-enabled?
                               :goerli-enabled?  goerli-enabled?})]
@@ -94,7 +98,7 @@
              (assoc-in [:wallet :ui :send :recipient] (or recipient address))
              (assoc-in [:wallet :ui :send :to-address] to-address)
              (assoc-in [:wallet :ui :send :address-prefix] prefix)
-              (assoc-in [:wallet :ui :send :selected-networks] selected-networks))
+              (assoc-in [:wallet :ui :send :receiver-networks] receiver-networks))
      :fx [[:dispatch
            [:wallet/wizard-navigate-forward
             {:current-screen stack-id
@@ -104,7 +108,16 @@
 (rf/reg-event-fx
 :wallet/update-receiver-networks
 (fn [{:keys [db]} [selected-networks]]
-   {:db (assoc-in db [:wallet :ui :send :selected-networks] selected-networks)}))
+   (let [amount                           (get-in db [:wallet :ui :send :amount])
+         disabled-from-chain-ids          (get-in db [:wallet :ui :send :disabled-from-chain-ids])
+         filtered-disabled-from-chain-ids (filter (fn [chain-id]
+                                                    (some #(= chain-id %)
+                                                          selected-networks))
+                                                  disabled-from-chain-ids)]
+     {:db (-> db
+              (assoc-in [:wallet :ui :send :receiver-networks] selected-networks)
+              (assoc-in [:wallet :ui :send :disabled-from-chain-ids] filtered-disabled-from-chain-ids))
+      :fx [[:dispatch [:wallet/get-suggested-routes {:amount amount}]]]})))

 (rf/reg-event-fx
 :wallet/send-select-token
@@ -195,6 +208,7 @@
         transaction-type        (get-in db [:wallet :ui :send :tx-type])
         collectible             (get-in db [:wallet :ui :send :collectible])
         to-address              (get-in db [:wallet :ui :send :to-address])
+         receiver-networks       (get-in db [:wallet :ui :send :receiver-networks])
         disabled-from-chain-ids (or (get-in db [:wallet :ui :send :disabled-from-chain-ids]) [])
         test-networks-enabled?  (get-in db [:profile/profile :test-networks-enabled?])
         networks                ((if test-networks-enabled? :test :prod)
@@ -215,7 +229,10 @@
         disabled-from-chain-ids disabled-from-chain-ids
         disabled-to-chain-ids   (if (= transaction-type :bridge)
                                   (filter #(not= % bridge-to-chain-id) network-chain-ids)
-                                   [])
+                                   (filter (fn [chain-id]
+                                             (not (some #(= chain-id %)
+                                                        receiver-networks)))
+                                           network-chain-ids))
         from-locked-amount      {}
         transaction-type-param  (case transaction-type
                                   :collectible constants/send-type-erc-721-transfer
@@ -233,6 +250,7 @@
                                  gas-rates
                                  from-locked-amount]]
     {:db            (-> db
+                         (assoc-in [:wallet :ui :send :amount] amount)
                         (assoc-in [:wallet :ui :send :loading-suggested-routes?] true)
                         (assoc-in [:wallet :ui :send :suggested-routes-call-timestamp] now))
      :json-rpc/call [{:method     "wallet_getSuggestedRoutes"
@@ -64,7 +64,7 @@
                                                                  :max-priority-fee-per-gas "0.011000001"
                                                                  :eip1559-enabled true}}]
   :wallet/wallet-send-suggested-routes            {:candidates []}
-   :wallet/wallet-send-selected-networks           [1]
+   :wallet/wallet-send-receiver-networks           [1]
   :view-id                                        :screen/wallet.send-input-amount
   :wallet/wallet-send-to-address                  "0x04371e2d9d66b82f056bc128064"
   :profile/currency-symbol                        "$"
@@ -5,6 +5,7 @@
    [react-native.core :as rn]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
+    [status-im.common.controlled-input.utils :as controlled-input]
    [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
    [status-im.contexts.wallet.common.asset-list.view :as asset-list]
    [status-im.contexts.wallet.common.utils :as utils]
@@ -12,86 +13,17 @@
    [status-im.contexts.wallet.send.input-amount.style :as style]
    [status-im.contexts.wallet.send.routes.view :as routes]
    [utils.address :as address]
-    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

 (defn- make-limit-label
-  [{:keys [amount currency]}]
+  [amount currency]
  (str amount
       " "
       (some-> currency
               name
               string/upper-case)))

-(def not-digits-or-dot-pattern
-  #"[^0-9+\.]")
-
-(def dot ".")
-
-(defn valid-input?
-  [current v]
-  (let [max-length          12
-        length-overflow?    (>= (count current) max-length)
-        extra-dot?          (and (= v dot) (string/includes? current dot))
-        extra-leading-zero? (and (= current "0") (= "0" (str v)))
-        non-numeric?        (re-find not-digits-or-dot-pattern (str v))]
-    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
-
-(defn- add-char-to-string
-  [s c idx]
-  (let [size (count s)]
-    (if (= size idx)
-      (str s c)
-      (str (subs s 0 idx)
-           c
-           (subs s idx size)))))
-
-(defn- move-input-cursor
-  ([input-selection-atom new-idx]
-   (move-input-cursor input-selection-atom new-idx new-idx))
-  ([input-selection-atom new-start-idx new-end-idx]
-   (let [start-idx (if (< new-start-idx 0) 0 new-start-idx)
-         end-idx   (if (< new-end-idx 0) 0 new-start-idx)]
-     (swap! input-selection-atom assoc :start start-idx :end end-idx))))
-
-(defn- normalize-input
-  [current v input-selection-atom]
-  (let [{:keys [start end]} @input-selection-atom]
-    (if (= start end)
-      (cond
-        (and (string/blank? current) (= v dot))
-        (do
-          (move-input-cursor input-selection-atom 2)
-          (str "0" v))
-
-        (and (= current "0") (not= v dot))
-        (do
-          (move-input-cursor input-selection-atom 1)
-          (str v))
-
-        :else
-        (do
-          (move-input-cursor input-selection-atom (inc start))
-          (add-char-to-string current v start)))
-      current)))
-
-(defn- make-new-input
-  [current v input-selection-atom]
-  (if (valid-input? current v)
-    (normalize-input current v input-selection-atom)
-    current))
-
-(defn- reset-input-error
-  [new-value prev-value input-error]
-  (reset! input-error
-    (> new-value prev-value)))
-
-(defn delete-from-string
-  [s idx]
-  (let [size (count s)]
-    (str (subs s 0 (dec idx)) (subs s idx size))))
-
 (defn- estimated-fees
  [{:keys [loading-suggested-routes? fees amount receiver]}]
  [rn/view {:style style/estimated-fees-container}
@@ -148,211 +80,121 @@
    initial-crypto-currency? :initial-crypto-currency?
    :or                      {initial-crypto-currency? true}}]
  (let [_ (rn/dismiss-keyboard!)
-        bottom                (safe-area/get-bottom)
-        input-value           (reagent/atom "")
-        clear-input!          #(reset! input-value "")
-        input-error           (reagent/atom false)
-        crypto-currency?      (reagent/atom initial-crypto-currency?)
-        input-selection       (reagent/atom {:start 0 :end 0})
-        handle-swap           (fn [{:keys [crypto? limit-fiat limit-crypto]}]
-                                (let [num-value     (parse-double @input-value)
-                                      current-limit (if crypto? limit-crypto limit-fiat)]
-                                  (reset! crypto-currency? crypto?)
-                                  (reset-input-error num-value current-limit input-error)))
-        handle-keyboard-press (fn [v loading-routes? current-limit-amount]
-                                (when-not loading-routes?
-                                  (let [current-value @input-value
-                                        new-value     (make-new-input current-value v input-selection)
-                                        num-value     (or (parse-double new-value) 0)]
-                                    (reset! input-value new-value)
-                                    (reset-input-error num-value current-limit-amount input-error)
-                                    (reagent/flush))))
-        handle-delete         (fn [loading-routes? current-limit-amount]
-                                (when-not loading-routes?
-                                  (let [{:keys [start end]} @input-selection
-                                        new-value           (delete-from-string @input-value start)]
-                                    (when (= start end)
-                                      (reset-input-error new-value current-limit-amount input-error)
-                                      (swap! input-value delete-from-string start)
-                                      (move-input-cursor input-selection (dec start)))
-                                    (reagent/flush))))
-        on-long-press-delete  (fn [loading-routes?]
-                                (when-not loading-routes?
-                                  (reset! input-value "")
-                                  (reset! input-error false)
-                                  (move-input-cursor input-selection 0)
-                                  (reagent/flush)))
-        handle-on-change      (fn [v current-limit-amount]
-                                (when (valid-input? @input-value v)
-                                  (let [num-value (or (parse-double v) 0)]
-                                    (reset! input-value v)
-                                    (reset-input-error num-value current-limit-amount input-error)
-                                    (reagent/flush))))
-        on-navigate-back      on-navigate-back
-        fetch-routes          (fn [input-num-value current-limit-amount bounce-duration-ms]
-                                (let [nav-current-screen-id (rf/sub [:view-id])
-                                      input-num-value       (or input-num-value 0)]
-                                  ; this check is to prevent effect being triggered when screen is
-                                  ; loaded but not being shown to the user (deep in the navigation
-                                  ; stack) and avoid undesired behaviors
-                                  (when (= nav-current-screen-id current-screen-id)
-                                    (if-not (or (empty? @input-value)
-                                                (<= input-num-value 0)
-                                                (> input-num-value current-limit-amount))
-                                      (debounce/debounce-and-dispatch
-                                       [:wallet/get-suggested-routes {:amount @input-value}]
-                                       bounce-duration-ms)
-                                      (rf/dispatch [:wallet/clean-suggested-routes])))))
-        handle-on-confirm     (fn []
-                                (rf/dispatch [:wallet/send-select-amount
-                                              {:amount   @input-value
-                                               :stack-id current-screen-id}]))
-        selection-change      (fn [selection]
-                                ;; `reagent/flush` is needed to properly propagate the
-                                ;; input cursor state. Since this is a controlled
-                                ;; component the cursor will become static if
-                                ;; `reagent/flush` is removed.
-                                (reset! input-selection selection)
-                                (reagent/flush))]
+        bottom           (safe-area/get-bottom)
+        crypto-currency? (reagent/atom initial-crypto-currency?)
+        on-navigate-back on-navigate-back]
    (fn []
-      (let [{fiat-currency :currency}  (rf/sub [:profile/profile])
+      (let [[input-state set-input-state] (rn/use-state controlled-input/init-state)
+            clear-input!                  #(set-input-state controlled-input/delete-all)
+            handle-on-confirm             (fn []
+                                            (rf/dispatch [:wallet/send-select-amount
+                                                          {:amount   (controlled-input/input-value
+                                                                      input-state)
+                                                           :stack-id current-screen-id}]))
+            {fiat-currency :currency}     (rf/sub [:profile/profile])
            {token-symbol   :symbol
-             token-networks :networks} (rf/sub [:wallet/wallet-send-token])
+             token-networks :networks}    (rf/sub [:wallet/wallet-send-token])
            {token-balance :total-balance
-             token-balances-per-chain :balances-per-chain
             :as
-             token}                    (rf/sub
-                                        [:wallet/current-viewing-account-tokens-filtered
-                                         (str token-symbol)])
-            conversion-rate            (-> token :market-values-per-currency :usd :price)
-            loading-routes?            (rf/sub
-                                        [:wallet/wallet-send-loading-suggested-routes?])
-            suggested-routes           (rf/sub [:wallet/wallet-send-suggested-routes])
-            best-routes                (when suggested-routes
-                                         (or (:best suggested-routes) []))
-            route                      (rf/sub [:wallet/wallet-send-route])
-            to-address                 (rf/sub [:wallet/wallet-send-to-address])
-            disabled-from-chain-ids    (rf/sub
-                                        [:wallet/wallet-send-disabled-from-chain-ids])
-            from-values-by-chain       (rf/sub [:wallet/wallet-send-from-values-by-chain])
-            to-values-by-chain         (rf/sub [:wallet/wallet-send-to-values-by-chain])
-            on-confirm                 (or default-on-confirm handle-on-confirm)
-            crypto-decimals            (or default-crypto-decimals
-                                           (utils/get-crypto-decimals-count token))
-            crypto-limit               (or default-limit-crypto
-                                           (utils/get-standard-crypto-format
-                                            token
-                                            token-balance))
-            fiat-limit                 (.toFixed (* token-balance conversion-rate) 2)
-            current-limit              #(if @crypto-currency? crypto-limit fiat-limit)
-            current-currency           (if @crypto-currency? token-symbol fiat-currency)
-            limit-label                (make-limit-label {:amount   (current-limit)
-                                                          :currency current-currency})
-            input-num-value            (parse-double @input-value)
-            confirm-disabled?          (or (nil? route)
-                                           (empty? route)
-                                           (empty? @input-value)
-                                           (<= input-num-value 0)
-                                           (> input-num-value (current-limit)))
-            amount-text                (str @input-value " " token-symbol)
-            first-route                (first route)
-            native-currency-symbol     (when-not confirm-disabled?
-                                         (get-in first-route [:from :native-currency-symbol]))
-            native-token               (when native-currency-symbol
-                                         (rf/sub [:wallet/token-by-symbol
-                                                  native-currency-symbol]))
-            fee-in-native-token        (when-not confirm-disabled?
-                                         (send-utils/calculate-full-route-gas-fee route))
-            fee-in-crypto-formatted    (when fee-in-native-token
-                                         (utils/get-standard-crypto-format
-                                          native-token
-                                          fee-in-native-token))
-            fee-in-fiat                (when-not confirm-disabled?
-                                         (utils/calculate-token-fiat-value
-                                          {:currency fiat-currency
-                                           :balance  fee-in-native-token
-                                           :token    native-token}))
-            currency-symbol            (rf/sub [:profile/currency-symbol])
-            fee-formatted              (when fee-in-fiat
-                                         (utils/get-standard-fiat-format
-                                          fee-in-crypto-formatted
-                                          currency-symbol
-                                          fee-in-fiat))
-            show-select-asset-sheet    #(rf/dispatch
-                                         [:show-bottom-sheet
-                                          {:content (fn []
-                                                      [select-asset-bottom-sheet
-                                                       clear-input!])}])
-            selected-networks          (rf/sub [:wallet/wallet-send-selected-networks])
-            affordable-networks        (send-utils/find-affordable-networks
-                                        {:balances-per-chain token-balances-per-chain
-                                         :input-value        @input-value
-                                         :selected-networks  selected-networks
-                                         :disabled-chain-ids disabled-from-chain-ids})]
+             token}                       (rf/sub
+                                           [:wallet/current-viewing-account-tokens-filtered
+                                            (str token-symbol)])
+            conversion-rate               (-> token :market-values-per-currency :usd :price)
+            loading-routes?               (rf/sub
+                                           [:wallet/wallet-send-loading-suggested-routes?])
+
+            route                         (rf/sub [:wallet/wallet-send-route])
+            to-address                    (rf/sub [:wallet/wallet-send-to-address])
+            nav-current-screen-id         (rf/sub [:view-id])
+
+            on-confirm                    (or default-on-confirm handle-on-confirm)
+            crypto-decimals               (or default-crypto-decimals
+                                              (utils/get-crypto-decimals-count token))
+            crypto-limit                  (or default-limit-crypto
+                                              (utils/get-standard-crypto-format
+                                               token
+                                               token-balance))
+            fiat-limit                    (.toFixed (* token-balance conversion-rate) 2)
+            current-limit                 #(if @crypto-currency? crypto-limit fiat-limit)
+            routes-can-be-fetched?        (and (= nav-current-screen-id current-screen-id)
+                                               (not
+                                                (or (empty? (controlled-input/input-value input-state))
+                                                    (<= (controlled-input/numeric-value input-state) 0)
+                                                    (> (controlled-input/numeric-value input-state)
+                                                       (current-limit)))))
+            current-currency              (if @crypto-currency? token-symbol fiat-currency)
+            input-num-value               (controlled-input/numeric-value input-state)
+            confirm-disabled?             (or (nil? route)
+                                              (empty? route)
+                                              (empty? (controlled-input/input-value input-state))
+                                              (<= input-num-value 0)
+                                              (> input-num-value (current-limit)))
+            amount-text                   (str (controlled-input/input-value input-state)
+                                               " "
+                                               token-symbol)
+            first-route                   (first route)
+            native-currency-symbol        (when-not confirm-disabled?
+                                            (get-in first-route [:from :native-currency-symbol]))
+            native-token                  (when native-currency-symbol
+                                            (rf/sub [:wallet/token-by-symbol
+                                                     native-currency-symbol]))
+            fee-in-native-token           (when-not confirm-disabled?
+                                            (send-utils/calculate-full-route-gas-fee route))
+            fee-in-crypto-formatted       (when fee-in-native-token
+                                            (utils/get-standard-crypto-format
+                                             native-token
+                                             fee-in-native-token))
+            fee-in-fiat                   (when-not confirm-disabled?
+                                            (utils/calculate-token-fiat-value
+                                             {:currency fiat-currency
+                                              :balance  fee-in-native-token
+                                              :token    native-token}))
+            currency-symbol               (rf/sub [:profile/currency-symbol])
+            fee-formatted                 (when fee-in-fiat
+                                            (utils/get-standard-fiat-format
+                                             fee-in-crypto-formatted
+                                             currency-symbol
+                                             fee-in-fiat))
+            show-select-asset-sheet       #(rf/dispatch
+                                            [:show-bottom-sheet
+                                             {:content (fn []
+                                                         [select-asset-bottom-sheet
+                                                          clear-input!])}])]
        (rn/use-mount
         (fn []
           (let [dismiss-keyboard-fn   #(when (= % "active") (rn/dismiss-keyboard!))
                 app-keyboard-listener (.addEventListener rn/app-state "change" dismiss-keyboard-fn)]
             #(.remove app-keyboard-listener))))
        (rn/use-effect
-         #(when (> (count affordable-networks) 0)
-            (fetch-routes input-num-value (current-limit) 2000))
-         [@input-value])
-        (rn/use-effect
-         #(when (> (count affordable-networks) 0)
-            (fetch-routes input-num-value (current-limit) 0))
-         [disabled-from-chain-ids])
+         (fn []
+           (set-input-state #(controlled-input/set-upper-limit % (current-limit))))
+         [@crypto-currency?])
        [rn/view
         {:style               style/screen
-          :accessibility-label (str "container" (when @input-error "-error"))}
+          :accessibility-label (str "container"
+                                    (when (controlled-input/input-error input-state) "-error"))}
         [account-switcher/view
          {:icon-name     :i/arrow-left
           :on-press      on-navigate-back
           :switcher-type :select-account}]
         [quo/token-input
-          {:container-style     style/input-container
-           :token               token-symbol
-           :currency            current-currency
-           :crypto-decimals     crypto-decimals
-           :error?              @input-error
-           :networks            (seq token-networks)
-           :title               (i18n/label :t/send-limit {:limit limit-label})
-           :conversion          conversion-rate
-           :show-keyboard?      false
-           :value               @input-value
-           :selection           @input-selection
-           :on-change-text      #(handle-on-change % (current-limit))
-           :on-selection-change selection-change
-           :on-swap             #(handle-swap
-                                  {:crypto?      %
-                                   :currency     current-currency
-                                   :token-symbol token-symbol
-                                   :limit-fiat   fiat-limit
-                                   :limit-crypto crypto-limit})
-           :on-token-press      show-select-asset-sheet}]
+          {:container-style style/input-container
+           :token           token-symbol
+           :currency        current-currency
+           :crypto-decimals crypto-decimals
+           :error?          (controlled-input/input-error input-state)
+           :networks        (seq token-networks)
+           :title           (i18n/label :t/send-limit
+                                        {:limit (make-limit-label (current-limit) current-currency)})
+           :conversion      conversion-rate
+           :show-keyboard?  false
+           :value           (controlled-input/input-value input-state)
+           :on-swap         #(reset! crypto-currency? %)
+           :on-token-press  show-select-asset-sheet}]
         [routes/view
-          {:from-values-by-chain   from-values-by-chain
-           :to-values-by-chain     to-values-by-chain
-           :affordable-networks    affordable-networks
-           :routes                 best-routes
-           :token                  token
-           :input-value            @input-value
-           :fetch-routes           #(fetch-routes % (current-limit) 2000)
-           :disabled-from-networks disabled-from-chain-ids
-           :on-press-from-network  (fn [chain-id _]
-                                     (let [disabled-chain-ids (if (contains? (set
-                                                                              disabled-from-chain-ids)
-                                                                             chain-id)
-                                                                (vec (remove #(= % chain-id)
-                                                                             disabled-from-chain-ids))
-                                                                (conj disabled-from-chain-ids
-                                                                      chain-id))
-                                           re-enabling-chain? (< (count disabled-chain-ids)
-                                                                 (count disabled-from-chain-ids))]
-                                       (when (or re-enabling-chain?
-                                                 (> (count affordable-networks) 1))
-                                         (rf/dispatch [:wallet/disable-from-networks
-                                                       disabled-chain-ids]))))}]
+          {:token                  token
+           :input-value            (controlled-input/input-value input-state)
+           :routes-can-be-fetched? routes-can-be-fetched?}]
         (when (or loading-routes? (seq route))
           [estimated-fees
            {:loading-suggested-routes? loading-routes?
@@ -369,6 +211,12 @@
          {:container-style      (style/keyboard-container bottom)
           :left-action          :dot
           :delete-key?          true
-           :on-press             #(handle-keyboard-press % loading-routes? (current-limit))
-           :on-delete            #(handle-delete loading-routes? (current-limit))
-           :on-long-press-delete #(on-long-press-delete loading-routes?)}]]))))
+           :on-press             (fn [c]
+                                   (when-not loading-routes?
+                                     (set-input-state #(controlled-input/add-character % c))))
+           :on-delete            (fn []
+                                   (when-not loading-routes?
+                                     (set-input-state controlled-input/delete-last)))
+           :on-long-press-delete (fn []
+                                   (when-not loading-routes?
+                                     (set-input-state controlled-input/delete-all)))}]]))))
@@ -4,12 +4,13 @@
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
    [quo.foundations.resources :as resources]
-    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils :as utils]
+    [status-im.contexts.wallet.common.utils.send :as send-utils]
    [status-im.contexts.wallet.send.routes.style :as style]
+    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.vector :as vector-utils]))
@@ -66,7 +67,7 @@
  [{:keys [fetch-routes theme]}]
  (let [network-details     (rf/sub [:wallet/network-details])
        {:keys [color]}     (rf/sub [:wallet/current-viewing-account])
-        selected-networks   (rf/sub [:wallet/wallet-send-selected-networks])
+        selected-networks   (rf/sub [:wallet/wallet-send-receiver-networks])
        prefix              (rf/sub [:wallet/wallet-send-address-prefix])
        prefix-seq          (string/split prefix #":")
        grouped-details     (group-by #(contains? (set prefix-seq) (:short-name %)) network-details)
@@ -200,19 +201,59 @@
      :on-press-from-network on-press-from-network
      :on-press-to-network   on-press-to-network}]))

+(defn fetch-routes
+  [amount routes-can-be-fetched? bounce-duration-ms]
+  (if routes-can-be-fetched?
+    (debounce/debounce-and-dispatch
+     [:wallet/get-suggested-routes {:amount amount}]
+     bounce-duration-ms)
+    (rf/dispatch [:wallet/clean-suggested-routes])))
+
 (defn view
-  [{:keys [from-values-by-chain to-values-by-chain routes token fetch-routes
-           affordable-networks disabled-from-networks on-press-from-network on-press-to-network]}]
-  (let [theme                     (quo.theme/use-theme)
-        token-symbol              (:symbol token)
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        network-links             (if loading-suggested-routes? affordable-networks routes)]
-    (if (or (and (not-empty affordable-networks) loading-suggested-routes?) (not-empty routes))
+  [{:keys [token theme input-value routes-can-be-fetched?
+           on-press-to-network]}]
+
+  (let [token-symbol                                   (:symbol token)
+        loading-suggested-routes?                      (rf/sub
+                                                        [:wallet/wallet-send-loading-suggested-routes?])
+        from-values-by-chain                           (rf/sub
+                                                        [:wallet/wallet-send-from-values-by-chain])
+        to-values-by-chain                             (rf/sub [:wallet/wallet-send-to-values-by-chain])
+        suggested-routes                               (rf/sub [:wallet/wallet-send-suggested-routes])
+        selected-networks                              (rf/sub [:wallet/wallet-send-receiver-networks])
+        disabled-from-chain-ids                        (rf/sub
+                                                        [:wallet/wallet-send-disabled-from-chain-ids])
+        routes                                         (when suggested-routes
+                                                         (or (:best suggested-routes) []))
+        {token-balances-per-chain :balances-per-chain} (rf/sub
+                                                        [:wallet/current-viewing-account-tokens-filtered
+                                                         (str token-symbol)])
+        affordable-networks                            (send-utils/find-affordable-networks
+                                                        {:balances-per-chain token-balances-per-chain
+                                                         :input-value        input-value
+                                                         :selected-networks  selected-networks
+                                                         :disabled-chain-ids disabled-from-chain-ids})
+        network-links                                  (if loading-suggested-routes?
+                                                         affordable-networks
+                                                         routes)
+        show-routes?                                   (or (and (not-empty affordable-networks)
+                                                                loading-suggested-routes?)
+                                                           (not-empty routes))]
+
+    (rn/use-effect
+     #(when (> (count affordable-networks) 0)
+        (fetch-routes input-value routes-can-be-fetched? 2000))
+     [input-value routes-can-be-fetched?])
+    (rn/use-effect
+     #(when (> (count affordable-networks) 0)
+        (fetch-routes input-value routes-can-be-fetched? 0))
+     [disabled-from-chain-ids])
+    (if show-routes?
      (let [initial-network-links-count   (count network-links)
-            disabled-count                (count disabled-from-networks)
-            network-links                 (if (not-empty disabled-from-networks)
+            disabled-count                (count disabled-from-chain-ids)
+            network-links                 (if (not-empty disabled-from-chain-ids)
                                            (add-disabled-networks network-links
-                                                                   disabled-from-networks
+                                                                   disabled-from-chain-ids
                                                                   loading-suggested-routes?)
                                            network-links)
            network-links-with-add-button (if (and (< (- (count network-links) disabled-count)
@@ -221,24 +262,39 @@
                                            (concat network-links [{:status :add}])
                                            network-links)]
        [rn/flat-list
-         {:data                    network-links-with-add-button
+         {:data network-links-with-add-button
          :content-container-style style/routes-container
-          :header                  [rn/view {:style style/routes-header-container}
-                                    [quo/section-label
-                                     {:section         (i18n/label :t/from-label)
-                                      :container-style style/section-label-left}]
-                                    [quo/section-label
-                                     {:section         (i18n/label :t/to-label)
-                                      :container-style style/section-label-right}]]
-          :render-data             {:from-values-by-chain      from-values-by-chain
-                                    :to-values-by-chain        to-values-by-chain
-                                    :theme                     theme
-                                    :fetch-routes              fetch-routes
-                                    :on-press-from-network     on-press-from-network
-                                    :on-press-to-network       on-press-to-network
-                                    :token-symbol              token-symbol
-                                    :loading-suggested-routes? loading-suggested-routes?}
-          :render-fn               render-network-link}])
+          :header [rn/view {:style style/routes-header-container}
+                   [quo/section-label
+                    {:section         (i18n/label :t/from-label)
+                     :container-style style/section-label-left}]
+                   [quo/section-label
+                    {:section         (i18n/label :t/to-label)
+                     :container-style style/section-label-right}]]
+          :render-data
+          {:from-values-by-chain      from-values-by-chain
+           :to-values-by-chain        to-values-by-chain
+           :theme                     theme
+           :fetch-routes              #(fetch-routes % routes-can-be-fetched? 2000)
+           :on-press-from-network     (fn [chain-id _]
+                                        (let [disabled-chain-ids (if (contains? (set
+                                                                                 disabled-from-chain-ids)
+                                                                                chain-id)
+                                                                   (vec (remove #(= % chain-id)
+                                                                                disabled-from-chain-ids))
+                                                                   (conj disabled-from-chain-ids
+                                                                         chain-id))
+                                              re-enabling-chain? (< (count disabled-chain-ids)
+                                                                    (count disabled-from-chain-ids))]
+                                          (when (or re-enabling-chain?
+                                                    (> (count affordable-networks) 1))
+                                            (rf/dispatch [:wallet/disable-from-networks
+                                                          disabled-chain-ids]))))
+           :on-press-to-network       on-press-to-network
+           :token-symbol              token-symbol
+           :loading-suggested-routes? loading-suggested-routes?}
+          :render-fn render-network-link}])
      [rn/view {:style style/empty-container}
       (when (and (not (nil? routes)) (not loading-suggested-routes?))
         [quo/text (i18n/label :t/no-routes-found)])])))
+
@@ -12,4 +12,5 @@
    :button-one-label  (i18n/label :t/confirm)
    :on-navigate-back  (fn []
                         (rf/dispatch [:wallet/clean-disabled-from-networks])
+                         (rf/dispatch [:wallet/clean-send-amount])
                         (rf/dispatch [:navigate-back]))}])
@@ -23,6 +23,7 @@
    status-im.contexts.communities.events
    status-im.contexts.communities.overview.events
    status-im.contexts.communities.sharing.events
+    status-im.contexts.contact.blocking.events
    status-im.contexts.onboarding.common.overlay.events
    status-im.contexts.onboarding.events
    status-im.contexts.profile.events
@@ -36,6 +37,7 @@
    status-im.contexts.wallet.common.wizard.events
    status-im.contexts.wallet.effects
    status-im.contexts.wallet.events
+    status-im.contexts.wallet.save-address.events
    status-im.contexts.wallet.send.events
    status-im.contexts.wallet.signals
    [status-im.db :as db]
@@ -13,6 +13,7 @@
   {::wallet.bridge-token                (enabled-in-env? :FLAG_BRIDGE_TOKEN_ENABLED)
    ::wallet.edit-derivation-path        (enabled-in-env? :FLAG_EDIT_DERIVATION_PATH)
    ::wallet.remove-account              (enabled-in-env? :FLAG_REMOVE_ACCOUNT_ENABLED)
+    ::wallet.import-private-key          (enabled-in-env? :FLAG_IMPORT_PRIVATE_KEY_ENABLED)
    ::wallet.long-press-watch-only-asset (enabled-in-env? :FLAG_LONG_PRESS_WATCH_ONLY_ASSET_ENABLED)
    ::wallet.assets-modal-manage-tokens  (enabled-in-env? :FLAG_ASSETS_MODAL_MANAGE_TOKENS)
    ::wallet.assets-modal-hide           (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE)
@@ -54,10 +54,10 @@
       (reset! state/modals (vec (butlast @state/modals)))
       (reset! state/modals []))

-     (let [component @state/dissmissing]
+     (let [dissmissing @state/dissmissing]
       (reset! state/dissmissing false)
-       (when (keyword? component)
-         (effects/open-modal component)))))
+       (when (vector? dissmissing)
+         (effects/open-modal dissmissing)))))

  ;;;; Toast

@@ -86,14 +86,14 @@
 ;;;; Navigate to

 (defn- navigate
-  [component]
+  [[component theme]]
  (let [{:keys [options]} (get views/screens component)]
    (dismiss-all-modals)
    (navigation/push
     (name @state/root-id)
     {:component {:id      component
                  :name    component
-                  :options (merge (options/root-options {:theme (:theme options)})
+                  :options (merge (options/root-options {:theme (or (:theme options) theme)})
                                  options)}})
    (state/navigation-state-push {:id     component
                                  :type   :stack
@@ -139,11 +139,6 @@

 (rf/reg-fx :navigate-back navigate-back)

-(rf/reg-fx :navigate-replace-fx
- (fn [view-id]
-   (navigate-back)
-   (navigate view-id)))
-
 (rf/reg-fx :navigate-back-to
 (fn [comp-id]
   (navigation/pop-to (name comp-id))
@@ -164,18 +159,19 @@
 ;;;; Modal

 (defn open-modal
-  [component]
+  [[component theme]]
  (let [{:keys [options]} (get views/screens component)
        sheet?            (:sheet? options)]
    (if @state/dissmissing
-      (reset! state/dissmissing component)
+      (reset! state/dissmissing [component theme])
      (do
        (swap! state/modals conj component)
        (navigation/show-modal
         {:stack {:children [{:component
                              {:name    component
                               :id      component
-                               :options (merge (options/root-options {:theme (:theme options)})
+                               :options (merge (options/root-options {:theme (or (:theme options)
+                                                                                 theme)})
                                               options
                                               (when sheet?
                                                 options/sheet-options))}}]}})))
@@ -37,7 +37,7 @@
            (all-screens-params component screen-params))
    :fx [[:dispatch [:hide-bottom-sheet]]
         [:dispatch [:dismiss-keyboard]]
-         [:open-modal-fx component]]}))
+         [:open-modal-fx [component (:theme db)]]]}))

 (rf/defn dismiss-modal
  {:events [:dismiss-modal]}
@@ -80,15 +80,6 @@
  {:db                       (assoc db :view-id stack-id)
   :effects.shell/change-tab stack-id})

-(rf/defn navigate-replace
-  {:events [:navigate-replace]}
-  [{:keys [db]} go-to-view-id screen-params]
-  (let [db (cond-> (assoc db :view-id go-to-view-id)
-             (seq screen-params)
-             (assoc-in [:navigation/screen-params go-to-view-id] screen-params))]
-    {:db                  db
-     :navigate-replace-fx go-to-view-id}))
-
 (rf/defn hide-bottom-sheet
  {:events [:hide-bottom-sheet]}
  [{:keys [db]}]
@@ -48,8 +48,13 @@
    [status-im.contexts.profile.edit.name.view :as edit-name]
    [status-im.contexts.profile.edit.view :as edit-profile]
    [status-im.contexts.profile.profiles.view :as profiles]
+    [status-im.contexts.profile.settings.screens.messages.blocked-users.view :as
+     settings.blocked-users]
+    [status-im.contexts.profile.settings.screens.messages.view :as settings.messages]
    [status-im.contexts.profile.settings.screens.password.view :as settings-password]
    [status-im.contexts.profile.settings.view :as settings]
+    [status-im.contexts.settings.wallet.saved-addresses.view :as saved-addresses-settings]
+    [status-im.contexts.settings.wallet.wallet-options.view :as wallet-options]
    [status-im.contexts.shell.activity-center.view :as activity-center]
    [status-im.contexts.shell.jump-to.view :as shell]
    [status-im.contexts.shell.qr-reader.view :as shell-qr-reader]
@@ -67,6 +72,8 @@
    [status-im.contexts.wallet.add-account.add-address-to-watch.view :as wallet-add-address-to-watch]
    [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view :as
     wallet-edit-derivation-path]
+    [status-im.contexts.wallet.add-account.create-account.import-private-key.view :as
+     wallet-import-private-key]
    [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view :as
     wallet-backup-recovery-phrase]
    [status-im.contexts.wallet.add-account.create-account.new-keypair.check-your-backup.view :as
@@ -100,7 +107,7 @@
     :options   options/transparent-screen-options
     :component activity-center/view}

-    {:name      :share-shell
+    {:name      :screen/share-shell
     :options   options/transparent-screen-options
     :component share/view}

@@ -390,6 +397,10 @@
    {:name      :screen/wallet.edit-derivation-path
     :component wallet-edit-derivation-path/view}

+    {:name      :screen/wallet.import-private-key
+     :options   {:insets {:top? true}}
+     :component wallet-import-private-key/view}
+
    {:name      :screen/wallet.collectible
     :component wallet-collectible/view}

@@ -471,7 +482,23 @@

    {:name      :settings-password
     :options   options/transparent-modal-screen-options
-     :component settings-password/view}]
+     :component settings-password/view}
+
+    {:name      :screen/settings.wallet
+     :options   options/transparent-modal-screen-options
+     :component wallet-options/view}
+
+    {:name      :screen/settings.saved-addresses
+     :options   options/transparent-modal-screen-options
+     :component saved-addresses-settings/view}
+
+    {:name      :screen/settings-messages
+     :options   options/transparent-modal-screen-options
+     :component settings.messages/view}
+
+    {:name      :screen/settings-blocked-users
+     :options   options/transparent-modal-screen-options
+     :component settings.blocked-users/view}]

   [{:name    :shell
     :options {:theme :dark}}]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ibrkhalil	c80df7f7a9	Improvements	2024-04-24 15:32:21 +02:00
ibrkhalil	f98ea75adb	cleanups	2024-04-24 15:32:21 +02:00
ibrkhalil	4540500da2	Show a menu of operations for a saved address	2024-04-24 15:32:20 +02:00
flexsurfer	3794742c8f	Reagent atom from theme regression #19729 (#19735 )	2024-04-24 15:05:53 +02:00
Siddarth Kumar	9db49b8ca0	move rn-mail code to our native modules (#19760 ) In this commit we nuke the unmaintained library `react-native-mail` and move over the logic to our native modules. This also helps to fix `make nix-update-gradle` which would fail because of that library. - Android - iOS status: ready	2024-04-24 11:55:40 +02:00
Shivek Khurana	ce5ae1d191	⛵ Add menu to reach saved addresses and show empty state (#19771 ) * 💚 Enable wallet on header navigation - Add settings screen - Add save address settings screen - Need to add empty state next * 🥡 Added empty state for saved-addresses - Fixed the standard title quo component - It's flex behaviour was buggy, and it's not being used anywhere * 🧂PR fixes and lint - Use callback everywhere * 🗞️ Move wallet settings to wallet namespace	2024-04-24 11:35:03 +02:00
Volodymyr Kozieiev	3a5122a50c	Refactoring of token input screen in send flow (#19750 ) * Refactoring for send input screen * lint fixes * small comments fixed * Controlled input logic reimplemented without atom * remove leftover	2024-04-24 10:25:17 +02:00
Brian Sztamfater	782d038fb0	fix: suggested routes are not calculated with preferred networks (#19668 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-04-24 04:50:25 -03:00
NikolayandJamie Caprani	e6f9932dc5	chore(wallet) import private key main screen (#19625 ) Co-authored-by: Jamie Caprani <jamiecaprani@gmail.com>	2024-04-23 14:28:49 -07:00
flexsurfer	380603ddce	Implement blocked contacts setting inside profile messages settings #… (#19616 )	2024-04-23 19:12:00 +02:00
Yevheniia Berdnyk	9b550e4b82	e2e: fixes 23.04	2024-04-23 18:24:20 +03:00
flexsurfer	6b5c807176	App crashes after sync #19655 (#19763 )	2024-04-23 15:28:35 +02:00
Icaro Motta	54b2e0e678	Remove support for editing shared addresses while request to join is pending approval (#19623 ) This PR completely removes support for editing shared addresses while a user's request to join is pending approval. The reason for the removal is that, in status-go, the control node that will process the message protobuf.ApplicationMetadataMessage_COMMUNITY_EDIT_SHARED_ADDRESSES verifies the user is already a member of the community, but a user waiting for approval to join is not yet a member. Removing this check doesn't sound like a good idea and we want to avoid bugs/complications for the next release. The feature isn't working anyway, so the purpose of this PR is also to cleanup code that doesn't work and won't be re-done anytime soon.	2024-04-23 10:08:31 -03:00
Icaro Motta	01a503f3bf	Log signals from the Clojure layer instead of native code (#19683 ) We log the entire signal data when it arrives from status-go in the native layer, where our Clojure logging mechanism is unavailable. Sometimes, the developer may not want that much noise during development, e.g. when managing integration or contract tests. This commit removes the native calls to log signals and adds a timbre (log/debug ...) call in the event handler :signals/signal-received. We know timbre will elide log calls at compile time given the minimum log level set, therefore, we don't need to worry about performance because we will log signals at the debug level only.	2024-04-23 09:53:07 -03:00
Mohsen	696fedcca2	[#19183 ] fix: scan qr design issues (#19698 )	2024-04-23 13:01:08 +03:00
Siddarth Kumar	7a1c29899b	skip share wallet component test (#19761 )	2024-04-23 11:21:33 +02:00