wip: refactor notifications permissions bindings

This commit adds limit for adding saved addresses upto 20 to prevent any unwanted behaviour.

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>

.env.jenkins

@@ -37,3 +37,4 @@ TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
+GOOGLE_FREE=0

Makefile

@@ -210,6 +210,7 @@ build-fdroid: export BUILD_TYPE = release
 build-fdroid: export ANDROID_ABI_SPLIT = false
 build-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
 build-fdroid: ##@build Build release for F-Droid
+	@scripts/google-free.sh
 	@scripts/build-android.sh
 
 build-android: export BUILD_ENV ?= prod

VERSION

@@ -1 +1 @@
-2.32.0
+2.32.21983

android/app/build.gradle

@@ -83,6 +83,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = hermesEnabled.toBoolean();
 
+/**
+ * Exclude google library so we can publish to external android stores
+ */
+def googleFree = project.env.get("GOOGLE_FREE", 0) == '1'
+
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
         return project.commitHash
@@ -143,6 +148,10 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
     }
+    // Disable default lint checks to remove redundant lintVitalReportRelease task
+    lintOptions {
+        checkReleaseBuilds false
+    }
 
     // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
     externalNativeBuild {
@@ -286,6 +295,28 @@ dependencies {
         implementation(jscFlavor)
     }
 
+    if (googleFree) {
+        implementation(project(':react-native-notifications')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.gms'
+        }
+
+        implementation(project(':react-native-firebase_app')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.gms'
+        }
+        
+        implementation(project(':react-native-firebase_messaging')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.gms'
+        } 
+    } else {
+        implementation project(':react-native-notifications') {
+            // exclude group: 'com.google.gms'
+        }
+        implementation 'com.google.firebase:firebase-messaging:24.1.0'
+    }
+
     // react-native-screens
     implementation("androidx.appcompat:appcompat:1.1.0-rc01")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02")
@@ -335,3 +366,7 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+if (!googleFree) {
+    apply plugin: 'com.google.gms.google-services'
+}

android/app/google-services.json

@@ -0,0 +1,119 @@
+{
+  "project_info": {
+    "project_number": "854811651919",
+    "firebase_url": "https://status-react-app.firebaseio.com",
+    "project_id": "status-react-app",
+    "storage_bucket": "status-react-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:11ee7444ded8a00a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:15dbe4af1e06ca3e005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:1d0d69fe8c1bb89b005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.pr"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -123,6 +123,12 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths" />
         </provider>
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon" />
+	    <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/notification_icon_color" tools:replace="android:resource" />
     </application>
 
 </manifest>

android/app/src/main/java/im/status/ethereum/MainApplication.kt

@@ -17,6 +17,7 @@ import im.status.ethereum.keycard.RNStatusKeycardPackage
 import im.status.ethereum.module.StatusPackage
 import im.status.ethereum.pushnotifications.PushNotificationPackage
 import im.status.ethereum.StatusOkHttpClientFactory
+import com.wix.reactnativenotifications.RNNotificationsPackage;
 
 class MainApplication : NavigationApplication() {
 

android/app/src/main/res/values/colors.xml

@@ -4,4 +4,5 @@
   <color name="alert_text">#000000</color>
   <color name="splash_background">#09101C</color>
   <color name="splash_status_bar_color">#ffffff</color>
+  <color name="notification_icon_color">#4360DF</color>
 </resources>

android/build.gradle

@@ -31,6 +31,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+        classpath("com.google.gms:google-services:4.4.2")
     }
 }
 

android/settings.gradle

@@ -19,3 +19,5 @@ project(':react-native-status-keycard').projectDir = new File(rootProject.projec
 include ':react-native-blur'
 project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android')
 includeBuild('../node_modules/@react-native/gradle-plugin')
+include ':react-native-notifications'
+project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')

ci/Jenkinsfile.android

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

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.17'
 
 import groovy.json.JsonBuilder
 

ci/Jenkinsfile.e2e-nightly

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

ci/Jenkinsfile.ios

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

ci/Jenkinsfile.tests

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

ios/GoogleService-Info.plist

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!-- <key>API_KEY</key>
+	<string>AIzaSyB_ZCi76uSX1RBqGiLIllUnJ8D6_cKrRGQ</string> -->
+	<!-- <key>CLIENT_ID</key>
+	<string>854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com</string> -->
+	<!-- <key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o</string> -->
+	
+	<key>API_KEY</key>
+	<string>AIzaSyAm5D6giymR_2llh-8SbCRL3oPxX_v3EZs</string>
+	<key>GCM_SENDER_ID</key>
+	<string>854811651919</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>im.status.ethereum</string>
+	<key>PROJECT_ID</key>
+	<string>status-react-app</string>
+	<key>STORAGE_BUCKET</key>
+	<string>status-react-app.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:854811651919:ios:11ee7444ded8a00a</string>
+	<key>DATABASE_URL</key>
+	<string>https://status-react-app.firebaseio.com</string>
+</dict>
+</plist>

ios/Podfile

@@ -64,6 +64,9 @@ abstract_target 'Status' do
   pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git", tag: '3.1.1'
   pod 'secp256k1', git: "https://github.com/status-im/secp256k1.swift.git", submodules: true
 
+  pod 'FirebaseCore', :modular_headers => true
+  pod 'GoogleUtilities', :modular_headers => true
+
   target 'StatusIm' do
 
     target 'StatusImTests' do

ios/Podfile.lock

@@ -11,8 +11,78 @@ PODS:
     - React-Core (= 0.73.5)
     - React-jsi (= 0.73.5)
     - ReactCommon/turbomodule/core (= 0.73.5)
+  - Firebase/CoreOnly (11.7.0):
+    - FirebaseCore (~> 11.7.0)
+  - Firebase/Messaging (11.7.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 11.7.0)
+  - FirebaseCore (11.7.0):
+    - FirebaseCoreInternal (~> 11.7.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreExtension (11.7.0):
+    - FirebaseCore (~> 11.7.0)
+  - FirebaseCoreInternal (11.7.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseInstallations (11.7.0):
+    - FirebaseCore (~> 11.7.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (11.7.0):
+    - FirebaseCore (~> 11.7.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleDataTransport (~> 10.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Reachability (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - nanopb (~> 3.30910.0)
   - fmt (6.2.1)
   - glog (0.3.5)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleUtilities (8.0.2):
+    - GoogleUtilities/AppDelegateSwizzler (= 8.0.2)
+    - GoogleUtilities/Environment (= 8.0.2)
+    - GoogleUtilities/Logger (= 8.0.2)
+    - GoogleUtilities/MethodSwizzler (= 8.0.2)
+    - GoogleUtilities/Network (= 8.0.2)
+    - "GoogleUtilities/NSData+zlib (= 8.0.2)"
+    - GoogleUtilities/Privacy (= 8.0.2)
+    - GoogleUtilities/Reachability (= 8.0.2)
+    - GoogleUtilities/SwizzlerTestHelpers (= 8.0.2)
+    - GoogleUtilities/UserDefaults (= 8.0.2)
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.0.2):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.0.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.0.2):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/SwizzlerTestHelpers (8.0.2):
+    - GoogleUtilities/MethodSwizzler
+  - GoogleUtilities/UserDefaults (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - hermes-engine (0.73.5):
     - hermes-engine/Pre-built (= 0.73.5)
   - hermes-engine/Pre-built (0.73.5)
@@ -35,6 +105,12 @@ PODS:
   - libwebp/sharpyuv (1.3.2)
   - libwebp/webp (1.3.2):
     - libwebp/sharpyuv
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - PromisesObjC (2.4.0)
   - RCT-Folly (2022.05.16.00):
     - boost
     - DoubleConversion
@@ -920,7 +996,7 @@ PODS:
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - react-native-compat (2.11.2):
+  - react-native-compat (2.17.3):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -938,6 +1014,8 @@ PODS:
     - React
   - react-native-netinfo (4.7.0):
     - React
+  - react-native-notifications (5.1.0):
+    - React-Core
   - react-native-orientation-locker (1.5.0):
     - React-Core
   - react-native-pdf (6.7.5):
@@ -1149,6 +1227,14 @@ PODS:
     - React-Core
     - SDWebImage (~> 5.11.1)
     - SDWebImageWebPCoder (~> 0.8.4)
+  - RNFBApp (21.7.2):
+    - Firebase/CoreOnly (= 11.7.0)
+    - React-Core
+  - RNFBMessaging (21.7.2):
+    - Firebase/Messaging (= 11.7.0)
+    - FirebaseCoreExtension
+    - React-Core
+    - RNFBApp
   - RNFS (2.16.6):
     - React
   - RNGestureHandler (2.14.1):
@@ -1170,6 +1256,11 @@ PODS:
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
+  - RNNotifee (9.1.8):
+    - React-Core
+    - RNNotifee/NotifeeCore (= 9.1.8)
+  - RNNotifee/NotifeeCore (9.1.8):
+    - React-Core
   - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.6.1):
@@ -1201,7 +1292,9 @@ DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
+  - FirebaseCore
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - GoogleUtilities
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - Keycard (from `https://github.com/status-im/Keycard.swift.git`, tag `3.1.1`)
   - libevent (~> 2.1.12)
@@ -1240,6 +1333,7 @@ DEPENDENCIES:
   - 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-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-notifications (from `../node_modules/react-native-notifications`)
   - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
   - react-native-pdf (from `../node_modules/react-native-pdf`)
   - react-native-shake (from `../node_modules/react-native-shake`)
@@ -1275,11 +1369,14 @@ DEPENDENCIES:
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
   - RNFastImage (from `../node_modules/react-native-fast-image`)
+  - "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
+  - "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
   - RNLinearGradient (from `../node_modules/react-native-linear-gradient`)
+  - "RNNotifee (from `../node_modules/@notifee/react-native`)"
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNShare (from `../node_modules/react-native-share`)
@@ -1292,10 +1389,20 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - BigInt
+    - Firebase
+    - FirebaseCore
+    - FirebaseCoreExtension
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
     - fmt
+    - GoogleDataTransport
+    - GoogleUtilities
     - HMSegmentedControl
     - libevent
     - libwebp
+    - nanopb
+    - PromisesObjC
     - SDWebImage
     - SDWebImageWebPCoder
     - SocketRocket
@@ -1388,6 +1495,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-lottie-splash-screen"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
+  react-native-notifications:
+    :path: "../node_modules/react-native-notifications"
   react-native-orientation-locker:
     :path: "../node_modules/react-native-orientation-locker"
   react-native-pdf:
@@ -1458,6 +1567,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/push-notification-ios"
   RNFastImage:
     :path: "../node_modules/react-native-fast-image"
+  RNFBApp:
+    :path: "../node_modules/@react-native-firebase/app"
+  RNFBMessaging:
+    :path: "../node_modules/@react-native-firebase/messaging"
   RNFS:
     :path: "../node_modules/react-native-fs"
   RNGestureHandler:
@@ -1468,6 +1581,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keychain"
   RNLinearGradient:
     :path: "../node_modules/react-native-linear-gradient"
+  RNNotifee:
+    :path: "../node_modules/@notifee/react-native"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
   RNReanimated:
@@ -1503,13 +1618,23 @@ SPEC CHECKSUMS:
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
+  Firebase: a64bf6a8546e6eab54f1c715cd6151f39d2329f4
+  FirebaseCore: 3227e35f4197a924206fbcdc0349325baf4f5de4
+  FirebaseCoreExtension: 206c1b399f0d103055207c16f299b28e3dbd1949
+  FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881
+  FirebaseInstallations: 9347e719c3d52d8d7b9074b2c32407dd027305e9
+  FirebaseMessaging: 00ece041b71ddb52a2862ffdee73fb6e9824bd0c
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: 3bd24405b9a875b3b3cf1ab1be69b5c30c5f28bc
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
   RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
   RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1536,13 +1661,14 @@ SPEC CHECKSUMS:
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: b2b140d3d65077a1d5d26be62d9415f895592344
   react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
-  react-native-compat: 3af9add14d349701306d3d052638435f6795ac2c
+  react-native-compat: fd639220cca206df6c74b95df56a1809d78ba5a3
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
+  react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
   react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
   react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
@@ -1578,11 +1704,14 @@ SPEC CHECKSUMS:
   RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6
   RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
+  RNFBApp: a5395f4df3ea5d19697bdc99f5a0400903e5fff6
+  RNFBMessaging: 3a01ad804d6cef7266794b922545b03161672a27
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
   RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
   RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
   RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6
+  RNNotifee: 4a6ee5c7deaf00e005050052d73ee6315dff7ec9
   RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
   RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564
@@ -1596,6 +1725,6 @@ SPEC CHECKSUMS:
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
 
-PODFILE CHECKSUM: 56d9f695324306d6db368d1172d211dfab55b7cb
+PODFILE CHECKSUM: 045882c321412243f263522149cf3968692f8c33
 
 COCOAPODS: 1.15.2

ios/StatusIm.xcodeproj/project.pbxproj

@@ -11,6 +11,9 @@
 		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 */; };
+		2BE1270E2D59242300023E5E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2BE1270D2D59242300023E5E /* GoogleService-Info.plist */; };
+		2BE1270F2D59242300023E5E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2BE1270D2D59242300023E5E /* GoogleService-Info.plist */; };
+		2BE127102D59242300023E5E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2BE1270D2D59242300023E5E /* GoogleService-Info.plist */; };
 		2D32CCEDFF64E1C3F1FB79AF /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6081A369F49E04EC54F77E1B /* libPods-Status-StatusIm-StatusImTests.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 */; };
@@ -116,6 +119,7 @@
 		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>"; };
 		203C46547A6E99D27529A8AA /* 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>"; };
 		24F63BCFEB33B4C969305A46 /* 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>"; };
+		2BE1270D2D59242300023E5E /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		344F43B59CCE090C3271FF08 /* 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>"; };
 		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>"; };
@@ -268,6 +272,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				2BE1270D2D59242300023E5E /* GoogleService-Info.plist */,
 				65F6941825780A4F00A45E76 /* Bridge.swift */,
 				3AAD2AB624A3A5F10075D594 /* StatusImPR */,
 				13B07FAE1A68108700A75B9A /* StatusIm */,
@@ -483,6 +488,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2BE1270F2D59242300023E5E /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -499,6 +505,7 @@
 				D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */,
 				3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */,
 				393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */,
+				2BE1270E2D59242300023E5E /* GoogleService-Info.plist in Resources */,
 				D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */,
 				57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */,
 				70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */,
@@ -521,6 +528,7 @@
 				3AAD2ACE24A3A60E0075D594 /* InterStatus-Regular.otf in Resources */,
 				3AAD2ACF24A3A60E0075D594 /* Inter-Italic.otf in Resources */,
 				3AAD2AD024A3A60E0075D594 /* Inter-Medium.otf in Resources */,
+				2BE127102D59242300023E5E /* GoogleService-Info.plist in Resources */,
 				3AAD2AD124A3A60E0075D594 /* Inter-MediumItalic.otf in Resources */,
 				3AAD2AD224A3A60E0075D594 /* Inter-Regular.otf in Resources */,
 				C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */,
@@ -572,19 +580,37 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMessaging/FirebaseMessaging_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -616,19 +642,37 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMessaging/FirebaseMessaging_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -732,19 +776,37 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMessaging/FirebaseMessaging_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${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",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -1291,17 +1353,13 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_CFLAGS = "$(inherited)  ";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
-					" ",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -1382,17 +1440,13 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_CFLAGS = "$(inherited)  ";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
-					" ",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";

ios/StatusIm/AppDelegate.mm

@@ -8,6 +8,7 @@
  */
 
 #import "AppDelegate.h"
+#import <Firebase.h>
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
 #import <asl.h>
@@ -45,6 +46,7 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  [FIRApp configure];
 
   if (!self.bridge) {
     self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];

nix/deps/gradle/deps.list

@@ -9,6 +9,7 @@ androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.annotation:annotation:1.5.0
 androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
@@ -47,7 +48,7 @@ androidx.core:core-ktx:1.12.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.0.0
 androidx.core:core:1.1.0
-androidx.core:core:1.1.0-rc01
+androidx.core:core:1.2.0
 androidx.core:core:1.6.0
 androidx.core:core:1.9.0
 androidx.core:core:1.12.0
@@ -81,6 +82,7 @@ androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
 androidx.fragment:fragment:1.1.0-rc01
 androidx.fragment:fragment:1.3.6
+androidx.fragment:fragment:1.5.7
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
@@ -102,6 +104,7 @@ androidx.lifecycle:lifecycle-runtime:2.1.0
 androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
 androidx.lifecycle:lifecycle-runtime:2.5.1
+androidx.lifecycle:lifecycle-service:2.1.0
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
@@ -110,6 +113,7 @@ androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.5.1
 androidx.loader:loader:1.0.0
+androidx.loader:loader:1.1.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.media:media:1.0.0
 androidx.multidex:multidex:2.0.1
@@ -117,11 +121,15 @@ androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
+androidx.room:room-common:2.5.0
+androidx.room:room-runtime:2.5.0
 androidx.savedstate:savedstate:1.0.0
 androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
 androidx.savedstate:savedstate:1.2.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
+androidx.sqlite:sqlite-framework:2.3.0
+androidx.sqlite:sqlite:2.3.0
 androidx.startup:startup-runtime:1.1.1
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
@@ -130,6 +138,7 @@ androidx.test.ext:junit:1.1.4-alpha05
 androidx.test.services:storage:1.4.2-alpha02
 androidx.test:annotation:1.0.0
 androidx.test:core:1.4.1-alpha05
+androidx.test:monitor:1.2.0
 androidx.test:monitor:1.6.0-alpha02
 androidx.test:runner:1.5.0-alpha02
 androidx.tracing:tracing:1.1.0
@@ -144,11 +153,14 @@ androidx.vectordrawable:vectordrawable:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
-androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
 androidx.webkit:webkit:1.4.0
+androidx.work:work-runtime:2.8.0
+app.notifee:core:202108261754
+backport-util-concurrent:backport-util-concurrent:3.1
+classworlds:classworlds:1.1-alpha-2
 commons-codec:commons-codec:1.4
 commons-codec:commons-codec:1.6
 commons-codec:commons-codec:1.9
@@ -162,6 +174,7 @@ com.adobe.xmp:xmpcore:6.1.11
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
+com.almworks.sqlite4java:sqlite4java:0.282
 com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.1
@@ -571,14 +584,40 @@ com.googlecode.javaewah:JavaEWAH:1.1.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
+com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1
+com.google.android.datatransport:transport-api:2.2.1
+com.google.android.datatransport:transport-api:3.0.0
+com.google.android.datatransport:transport-api:3.1.0
+com.google.android.datatransport:transport-backend-cct:2.3.3
+com.google.android.datatransport:transport-backend-cct:3.1.9
+com.google.android.datatransport:transport-runtime:2.2.5
+com.google.android.datatransport:transport-runtime:3.1.9
+com.google.android.gms:play-services-auth-api-phone:18.0.2
+com.google.android.gms:play-services-auth-base:18.0.10
+com.google.android.gms:play-services-auth:21.3.0
+com.google.android.gms:play-services-basement:17.0.0
+com.google.android.gms:play-services-basement:18.0.0
+com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-base:18.5.0
+com.google.android.gms:play-services-cloud-messaging:16.0.0
+com.google.android.gms:play-services-cloud-messaging:17.2.0
+com.google.android.gms:play-services-fido:20.0.1
+com.google.android.gms:play-services-stats:17.0.0
+com.google.android.gms:play-services-stats:17.0.2
+com.google.android.gms:play-services-tasks:17.0.0
+com.google.android.gms:play-services-tasks:18.0.1
+com.google.android.gms:play-services-tasks:18.2.0
+com.google.android.gms:strict-version-matcher-plugin:1.2.4
 com.google.android.material:material:1.2.0-alpha03
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-common-protos:2.0.1
+com.google.auto.service:auto-service:1.0-rc4
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.5.2
+com.google.auto:auto-common:0.8
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.2.4
@@ -600,8 +639,38 @@ com.google.errorprone:error_prone_annotations:2.4.0
 com.google.errorprone:error_prone_annotations:2.7.1
 com.google.errorprone:error_prone_annotations:2.9.0
 com.google.errorprone:error_prone_annotations:2.11.0
+com.google.errorprone:error_prone_annotations:2.26.0
+com.google.errorprone:error_prone_annotations:2.28.0
+com.google.firebase:firebase-annotations:16.0.0
+com.google.firebase:firebase-annotations:16.2.0
+com.google.firebase:firebase-bom:33.8.0
+com.google.firebase:firebase-common-ktx:21.0.0
+com.google.firebase:firebase-common:19.5.0
+com.google.firebase:firebase-common:21.0.0
+com.google.firebase:firebase-components:16.1.0
+com.google.firebase:firebase-components:18.0.0
+com.google.firebase:firebase-datatransport:17.0.10
+com.google.firebase:firebase-datatransport:18.2.0
+com.google.firebase:firebase-encoders-json:17.1.0
+com.google.firebase:firebase-encoders-json:18.0.0
+com.google.firebase:firebase-encoders-proto:16.0.0
+com.google.firebase:firebase-encoders:16.1.0
+com.google.firebase:firebase-encoders:17.0.0
+com.google.firebase:firebase-iid-interop:17.1.0
+com.google.firebase:firebase-iid:21.1.0
+com.google.firebase:firebase-installations-interop:16.0.1
+com.google.firebase:firebase-installations-interop:17.1.1
+com.google.firebase:firebase-installations:16.3.5
+com.google.firebase:firebase-installations:17.2.0
+com.google.firebase:firebase-installations:18.0.0
+com.google.firebase:firebase-measurement-connector:18.0.0
+com.google.firebase:firebase-measurement-connector:19.0.0
+com.google.firebase:firebase-messaging:21.1.0
+com.google.firebase:firebase-messaging:24.1.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
+com.google.gms:google-services:4.4.2
 com.google.guava:failureaccess:1.0.1
+com.google.guava:failureaccess:1.0.2
 com.google.guava:guava:17.0
 com.google.guava:guava:22.0
 com.google.guava:guava:23.0
@@ -611,16 +680,19 @@ com.google.guava:guava:29.0-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:guava:31.0.1-jre
 com.google.guava:guava:31.1-jre
+com.google.guava:guava:33.3.1-android
 com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
+com.google.j2objc:j2objc-annotations:3.0.0
 com.google.jimfs:jimfs:1.1
 com.google.prefab:cli:2.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
 com.google.protobuf:protobuf-java-util:3.17.2
 com.google.protobuf:protobuf-java-util:3.19.3
+com.google.protobuf:protobuf-java:2.6.1
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
@@ -639,6 +711,7 @@ com.google.zxing:core:3.4.1
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
+com.squareup.assertj:assertj-android:1.1.1
 com.squareup.okhttp3:okhttp-tls:4.11.0
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
@@ -662,6 +735,7 @@ com.tunnelvisionlabs:antlr4-runtime:4.5
 com.tunnelvisionlabs:antlr4:4.5
 de.undercouch:gradle-download-task:4.1.1
 de.undercouch:gradle-download-task:5.0.1
+gradle.plugin.io.invertase.gradle:react-native:1.5
 io.grpc:grpc-api:1.21.1
 io.grpc:grpc-api:1.39.0
 io.grpc:grpc-api:1.45.1
@@ -730,8 +804,12 @@ javax.xml.bind:jaxb-api:2.3.1
 junit:junit:4.12
 junit:junit:4.13.2
 me.zhanghai.android.materialprogressbar:library:1.4.2
+nekohtml:nekohtml:1.9.6.2
+nekohtml:xercesMinimal:1.9.6.2
+net.bytebuddy:byte-buddy-agent:1.9.10
 net.bytebuddy:byte-buddy-agent:1.11.13
 net.bytebuddy:byte-buddy-agent:1.11.19
+net.bytebuddy:byte-buddy:1.9.10
 net.bytebuddy:byte-buddy:1.11.13
 net.bytebuddy:byte-buddy:1.11.19
 net.java.dev.jna:jna-platform:5.6.0
@@ -749,6 +827,8 @@ org.antlr:ST4:4.0.8
 org.antlr:antlr4:4.5.3
 org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr:3.5.2
+org.apache.ant:ant-launcher:1.8.0
+org.apache.ant:ant:1.8.0
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-compress:1.12
 org.apache.commons:commons-compress:1.20
@@ -771,11 +851,27 @@ org.apache.httpcomponents:httpcore:4.4.15
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
+org.apache.maven.wagon:wagon-file:1.0-beta-6
+org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6
+org.apache.maven.wagon:wagon-http-shared:1.0-beta-6
+org.apache.maven.wagon:wagon-provider-api:1.0-beta-6
+org.apache.maven:maven-ant-tasks:2.1.3
+org.apache.maven:maven-artifact-manager:2.2.1
+org.apache.maven:maven-artifact:2.2.1
+org.apache.maven:maven-error-diagnostics:2.2.1
+org.apache.maven:maven-model:2.2.1
+org.apache.maven:maven-plugin-registry:2.2.1
+org.apache.maven:maven-profile:2.2.1
+org.apache.maven:maven-project:2.2.1
+org.apache.maven:maven-repository-metadata:2.2.1
+org.apache.maven:maven-settings:2.2.1
+org.assertj:assertj-core:3.8.0
 org.bitbucket.b_c:jose4j:0.7.0
 org.bouncycastle:bcpkix-jdk15on:1.48
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.48
+org.bouncycastle:bcprov-jdk15on:1.52
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
 org.bouncycastle:bcprov-jdk15on:1.67
@@ -785,6 +881,7 @@ org.checkerframework:checker-qual:2.8.1
 org.checkerframework:checker-qual:2.11.1
 org.checkerframework:checker-qual:3.5.0
 org.checkerframework:checker-qual:3.12.0
+org.checkerframework:checker-qual:3.43.0
 org.codehaus.groovy:groovy-xml:3.0.9
 org.codehaus.groovy:groovy-xml:3.0.10
 org.codehaus.groovy:groovy:3.0.9
@@ -793,6 +890,9 @@ org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.codehaus.mojo:animal-sniffer-annotations:1.19
+org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
+org.codehaus.plexus:plexus-interpolation:1.11
+org.codehaus.plexus:plexus-utils:1.5.15
 org.codehaus.woodstox:stax2-api:4.2.1
 org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
@@ -807,8 +907,11 @@ org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
 org.gradle.toolchains:foojay-resolver:0.5.0
-org.gradle:github-dependency-graph-gradle-plugin:1.3.1
+org.gradle:github-dependency-graph-gradle-plugin:1.3.2
+org.greenrobot:eventbus-java:3.3.1
+org.greenrobot:eventbus:3.3.1
 org.hamcrest:hamcrest-core:1.3
+org.hamcrest:hamcrest-library:1.3
 org.hamcrest:hamcrest:2.2
 org.jacoco:org.jacoco.core:0.7.4.201502262128
 org.jacoco:org.jacoco.report:0.7.4.201502262128
@@ -817,21 +920,28 @@ org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:atomicfu:0.16.3
+org.jetbrains.kotlinx:atomicfu:0.17.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.8.0
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
@@ -913,6 +1023,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
@@ -925,6 +1036,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
@@ -935,6 +1047,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
@@ -947,6 +1060,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.7.10
 org.jetbrains.kotlin:kotlin-stdlib:1.8.0
 org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.9.22
 org.jetbrains.kotlin:kotlin-tooling-core:1.8.0
@@ -968,9 +1082,11 @@ org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.7.7
 org.jvnet.staxex:stax-ex:1.8
 org.jvnet.staxex:stax-ex:1.8.1
+org.mockito:mockito-core:2.28.2
 org.mockito:mockito-core:3.12.4
 org.mockito:mockito-core:4.0.0
 org.mockito:mockito-inline:4.0.0
+org.objenesis:objenesis:2.6
 org.objenesis:objenesis:3.2
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
@@ -1001,17 +1117,28 @@ org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
 org.ow2.asm:asm:9.1
 org.ow2.asm:asm:9.2
+org.robolectric:annotations:4.3
 org.robolectric:annotations:4.7.3
+org.robolectric:junit:4.3
 org.robolectric:junit:4.7.3
 org.robolectric:nativeruntime:4.7.3
+org.robolectric:pluginapi:4.3
 org.robolectric:pluginapi:4.7.3
+org.robolectric:plugins-maven-dependency-resolver:4.3
 org.robolectric:plugins-maven-dependency-resolver:4.7.3
+org.robolectric:resources:4.3
 org.robolectric:resources:4.7.3
+org.robolectric:robolectric:4.3
 org.robolectric:robolectric:4.7.3
+org.robolectric:sandbox:4.3
 org.robolectric:sandbox:4.7.3
+org.robolectric:shadowapi:4.3
 org.robolectric:shadowapi:4.7.3
+org.robolectric:shadows-framework:4.3
 org.robolectric:shadows-framework:4.7.3
+org.robolectric:utils-reflector:4.3
 org.robolectric:utils-reflector:4.7.3
+org.robolectric:utils:4.3
 org.robolectric:utils:4.7.3
 org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1

nix/deps/gradle/deps.urls

@@ -2,6 +2,7 @@ https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0-rc01/ac
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/activity-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.2.4/activity-1.2.4.pom
+https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.5.1/activity-1.5.1.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.6.0/activity-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.0.0/annotation-experimental-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.1.0/annotation-experimental-1.1.0.pom
@@ -14,6 +15,7 @@ https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0-rc0
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.3.0/annotation-1.3.0.pom
+https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.5.0/annotation-1.5.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.6.0/annotation-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0-rc01/appcompat-resources-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
@@ -31,6 +33,7 @@ https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.1/cor
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0-rc01/core-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.1/core-runtime-2.0.1.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/autofill/autofill/1.1.0/autofill-1.1.0.pom
@@ -100,6 +103,7 @@ https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0-rc01/fr
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fragment-1.2.5.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom
+https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.5.7/fragment-1.5.7.pom
 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom
@@ -127,6 +131,7 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.2
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.3.1/lifecycle-runtime-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.4.1/lifecycle-runtime-2.4.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.5.1/lifecycle-runtime-2.5.1.pom
+https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-service/2.1.0/lifecycle-service-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/1.0.0/lifecycle-viewmodel-savedstate-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.3.1/lifecycle-viewmodel-savedstate-2.3.1.pom
@@ -138,6 +143,7 @@ https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.3.1/lifecycle-viewmodel-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.5.1/lifecycle-viewmodel-2.5.1.pom
 https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.1.0/loader-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/media/media/1.0.0/media-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/multidex/multidex/2.0.1/multidex-2.0.1.pom
@@ -145,11 +151,15 @@ https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.p
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/resourceinspection/resourceinspection-annotation/1.0.1/resourceinspection-annotation-1.0.1.pom
+https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.5.0/room-common-2.5.0.pom
+https://dl.google.com/dl/android/maven2/androidx/room/room-runtime/2.5.0/room-runtime-2.5.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0-rc01/savedstate-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.1.0/savedstate-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.2.0/savedstate-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite-framework/2.3.0/sqlite-framework-2.3.0.pom
+https://dl.google.com/dl/android/maven2/androidx/sqlite/sqlite/2.3.0/sqlite-2.3.0.pom
 https://dl.google.com/dl/android/maven2/androidx/startup/startup-runtime/1.0.0/startup-runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/startup/startup-runtime/1.1.1/startup-runtime-1.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.0.0/swiperefreshlayout-1.0.0.pom
@@ -158,6 +168,7 @@ https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefresh
 https://dl.google.com/dl/android/maven2/androidx/test/annotation/1.0.0/annotation-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/test/core/1.4.1-alpha05/core-1.4.1-alpha05.pom
 https://dl.google.com/dl/android/maven2/androidx/test/ext/junit/1.1.4-alpha05/junit-1.1.4-alpha05.pom
+https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.2.0/monitor-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.4.0/monitor-1.4.0.pom
 https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.6.0-alpha02/monitor-1.6.0-alpha02.pom
 https://dl.google.com/dl/android/maven2/androidx/test/runner/1.5.0-alpha02/runner-1.5.0-alpha02.pom
@@ -181,6 +192,7 @@ https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedpa
 https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/webkit/webkit/1.4.0/webkit-1.4.0.pom
+https://dl.google.com/dl/android/maven2/androidx/work/work-runtime/2.8.0/work-runtime-2.8.0.pom
 https://dl.google.com/dl/android/maven2/android/arch/core/common/1.0.0/common-1.0.0.pom
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/common-1.0.0.pom
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
@@ -206,19 +218,27 @@ https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-draw
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26.0.2/appcompat-v7-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/27.0.1/appcompat-v7-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7/27.0.1/recyclerview-v7-27.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/26.0.2/support-annotations-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/26.1.0/support-annotations-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/27.0.1/support-annotations-27.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/28.0.0/support-annotations-28.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-compat/26.0.2/support-compat-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-compat/26.1.0/support-compat-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-compat/27.0.1/support-compat-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/26.0.2/support-core-ui-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/26.1.0/support-core-ui-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/27.0.1/support-core-ui-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/26.0.2/support-core-utils-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/26.1.0/support-core-utils-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-core-utils/27.0.1/support-core-utils-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/26.0.2/support-fragment-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/26.1.0/support-fragment-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/27.0.1/support-fragment-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-media-compat/26.0.2/support-media-compat-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-media-compat/26.1.0/support-media-compat-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/support-v4-26.0.2.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.1.0/support-v4-26.1.0.pom
 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
@@ -531,8 +551,79 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.1/zipflinger-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.4.2/zipflinger-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.1.1/zipflinger-8.1.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.0/transport-api-2.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/3.0.0/transport-api-3.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/3.1.0/transport-api-3.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/3.1.8/transport-backend-cct-3.1.8.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/3.1.9/transport-backend-cct-3.1.9.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.0/transport-runtime-2.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/3.1.8/transport-runtime-3.1.8.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/3.1.9/transport-runtime-3.1.9.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth-api-phone/18.0.2/play-services-auth-api-phone-18.0.2.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth-base/18.0.10/play-services-auth-base-18.0.10.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-auth/21.3.0/play-services-auth-21.3.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/16.0.1/play-services-basement-16.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/17.0.0/play-services-basement-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.0.0/play-services-basement-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.0.2/play-services-basement-18.0.2.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.1.0/play-services-basement-18.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.2.0/play-services-basement-18.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.3.0/play-services-basement-18.3.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.4.0/play-services-basement-18.4.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/18.0.1/play-services-base-18.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/18.5.0/play-services-base-18.5.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/16.0.0/play-services-cloud-messaging-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/17.2.0/play-services-cloud-messaging-17.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-fido/20.0.1/play-services-fido-20.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.2/play-services-stats-17.0.2.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/16.0.1/play-services-tasks-16.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.0.1/play-services-tasks-18.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.0.2/play-services-tasks-18.0.2.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.1.0/play-services-tasks-18.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.2.0/play-services-tasks-18.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/strict-version-matcher-plugin/1.2.4/strict-version-matcher-plugin-1.2.4.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.1.0/firebase-annotations-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.2.0/firebase-annotations-16.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-bom/33.8.0/firebase-bom-33.8.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common-ktx/20.4.2/firebase-common-ktx-20.4.2.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common-ktx/21.0.0/firebase-common-ktx-21.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/19.5.0/firebase-common-19.5.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/20.3.3/firebase-common-20.3.3.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/20.4.2/firebase-common-20.4.2.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/21.0.0/firebase-common-21.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/17.1.0/firebase-components-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/17.1.3/firebase-components-17.1.3.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/17.1.5/firebase-components-17.1.5.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/18.0.0/firebase-components-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-datatransport/17.0.10/firebase-datatransport-17.0.10.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-datatransport/18.2.0/firebase-datatransport-18.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/18.0.0/firebase-encoders-json-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-proto/16.0.0/firebase-encoders-proto-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/17.0.0/firebase-encoders-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid-interop/17.1.0/firebase-iid-interop-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid/21.1.0/firebase-iid-21.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/16.0.1/firebase-installations-interop-16.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/17.1.0/firebase-installations-interop-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/17.1.1/firebase-installations-interop-17.1.1.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/16.3.5/firebase-installations-16.3.5.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/17.2.0/firebase-installations-17.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/18.0.0/firebase-installations-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measurement-connector/18.0.0/firebase-measurement-connector-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measurement-connector/19.0.0/firebase-measurement-connector-19.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/21.1.0/firebase-messaging-21.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/24.1.0/firebase-messaging-24.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/gms/google-services/4.4.2/google-services-4.4.2.pom
 https://dl.google.com/dl/android/maven2/com/google/prefab/cli/2.0.0/cli-2.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/android-device-provider-local/0.0.8-alpha08/android-device-provider-local-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/android-driver-instrumentation/0.0.8-alpha08/android-driver-instrumentation-0.0.8-alpha08.pom
@@ -552,19 +643,29 @@ https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animat
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
 https://jitpack.io/com/github/zacharee/AndroidPdfViewer/4.0.1/AndroidPdfViewer-4.0.1.pom
 https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
-https://plugins.gradle.org/m2/org/gradle/github-dependency-graph-gradle-plugin/1.3.1/github-dependency-graph-gradle-plugin-1.3.1.pom
+https://plugins.gradle.org/m2/gradle/plugin/io/invertase/gradle/react-native/1.5/react-native-1.5.pom
+https://plugins.gradle.org/m2/io/invertase/gradle/build/io.invertase.gradle.build.gradle.plugin/1.5/io.invertase.gradle.build.gradle.plugin-1.5.pom
+https://plugins.gradle.org/m2/org/gradle/github-dependency-graph-gradle-plugin/1.3.2/github-dependency-graph-gradle-plugin-1.3.2.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver-convention/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.5.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver/0.5.0/foojay-resolver-0.5.0.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.pom
+https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
+https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.15/commons-codec-1.15.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.18.0/commons-codec-1.18.0.pom
+https://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.18.0/commons-io-2.18.0.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.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.4/commons-logging-1.3.4.pom
@@ -572,6 +673,7 @@ https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/airbnb/android/lottie/3.4.4/lottie-3.4.4.pom
+https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/0.282/sqlite4java-0.282.pom
 https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/1.0.392/sqlite4java-1.0.392.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.pom
@@ -685,8 +787,10 @@ https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.18.2/jackson-module-jaxb-annotations-2.18.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/55/oss-parent-55.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/61/oss-parent-61.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/7.1.0/woodstox-core-7.1.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.pom
@@ -702,11 +806,15 @@ https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.2.3/Java
 https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.pom
 https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.pom
 https://repo.maven.apache.org/maven2/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.pom
+https://repo.maven.apache.org/maven2/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/accessibility-test-framework-2.1.pom
 https://repo.maven.apache.org/maven2/com/google/api/grpc/proto-google-common-protos/1.12.0/proto-google-common-protos-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.pom
+https://repo.maven.apache.org/maven2/com/google/auto/auto-common/0.8/auto-common-0.8.pom
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3.pom
+https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/5/auto-parent-5.pom
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6.pom
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/7/auto-parent-7.pom
+https://repo.maven.apache.org/maven2/com/google/auto/service/auto-service/1.0-rc4/auto-service-1.0-rc4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.3/auto-value-annotations-1.6.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.pom
@@ -726,7 +834,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.5/gson
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.6/gson-parent-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.9/gson-parent-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.9.1/gson-parent-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.11.0/gson-parent-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.12.1/gson-parent-2.12.1.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.2.4.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
@@ -735,9 +843,10 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.12.1/gson-2.12.1.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.7.0/tink-1.7.0.pom
+https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.24/dagger-2.24.pom
 https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.28.3/dagger-2.28.3.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom
@@ -750,7 +859,8 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.26.0/error_prone_annotations-2.26.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.28.0/error_prone_annotations-2.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.36.0/error_prone_annotations-2.36.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
@@ -763,7 +873,8 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.26.0/error_prone_parent-2.26.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.28.0/error_prone_parent-2.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.36.0/error_prone_parent-2.36.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
@@ -781,8 +892,9 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-jre/guava-parent-33.3.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.1-jre/guava-testlib-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-android/guava-parent-33.3.1-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.4.0-jre/guava-parent-33.4.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.4.0-jre/guava-testlib-33.4.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -795,7 +907,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.1-jre/guava-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.1-android/guava-33.3.1-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.4.0-jre/guava-33.4.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -809,7 +922,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.29.0/protobuf-bom-4.29.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.30.0-RC1/protobuf-bom-4.30.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-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
@@ -817,6 +930,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.10
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.17.2/protobuf-java-util-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.19.2/protobuf-java-util-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.19.3/protobuf-java-util-3.19.3.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.pom
@@ -826,7 +940,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.29.0/protobuf-java-4.29.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.30.0-RC1/protobuf-java-4.30.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-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
@@ -837,7 +951,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.29.0/protobuf-parent-4.29.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.30.0-RC1/protobuf-parent-4.30.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -845,6 +959,7 @@ https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.4.1/zxing-p
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/assertj/assertj-android/1.1.1/assertj-android-1.1.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1.10.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.13.0/javapoet-1.13.0.pom
@@ -858,13 +973,13 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.10.2/okio-jvm-3.10.2.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.1/okio-3.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.10.2/okio-3.10.2.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -993,7 +1108,10 @@ https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.2
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.pom
 https://repo.maven.apache.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.pom
+https://repo.maven.apache.org/maven2/javax/el/javax.el-api/3.0.1-b06/javax.el-api-3.0.1-b06.pom
+https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/2.0-PFD2/cdi-api-2.0-PFD2.pom
 https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
+https://repo.maven.apache.org/maven2/javax/interceptor/javax.interceptor-api/1.2.2/javax.interceptor-api-1.2.2.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
@@ -1001,20 +1119,26 @@ https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12/jaxb-api-2.2
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom
+https://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
+https://repo.maven.apache.org/maven2/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom
+https://repo.maven.apache.org/maven2/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.9.6.2.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.9.10/byte-buddy-agent-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.4/byte-buddy-agent-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.11/byte-buddy-agent-1.15.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.9.10/byte-buddy-parent-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.4/byte-buddy-parent-1.15.4.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.10/byte-buddy-parent-1.15.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.11/byte-buddy-parent-1.15.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.9.10/byte-buddy-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.4/byte-buddy-1.15.4.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.10/byte-buddy-1.15.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.11/byte-buddy-1.15.11.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1050,7 +1174,13 @@ https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime
 https://repo.maven.apache.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2.pom
 https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.pom
 https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/4.0.2/stringtemplate-4.0.2.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant/1.8.0/ant-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/1/apache-1.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
@@ -1058,6 +1188,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
@@ -1081,6 +1212,10 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/78/commons-parent-78.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/79/commons-parent-79.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis-default-flava/2.3/genesis-default-flava-2.3.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis-java8-flava/2.3/genesis-java8-flava-2.3.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis/2.3/genesis-2.3.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
@@ -1119,11 +1254,95 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpmime/4.5.2/ht
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/7/project-7.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-annotations/4.0.0-rc-2/maven-api-annotations-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-core/4.0.0-rc-2/maven-api-core-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-di/4.0.0-rc-2/maven-api-di-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-metadata/4.0.0-rc-2/maven-api-metadata-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-meta/4.0.0-alpha-9/maven-api-meta-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-model/4.0.0-rc-2/maven-api-model-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-plugin/4.0.0-rc-2/maven-api-plugin-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-settings/4.0.0-rc-2/maven-api-settings-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-spi/4.0.0-rc-2/maven-api-spi-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-toolchain/4.0.0-rc-2/maven-api-toolchain-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-xml/4.0.0-alpha-9/maven-api-xml-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api-xml/4.0.0-rc-2/maven-api-xml-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api/4.0.0-alpha-9/maven-api-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-api/4.0.0-rc-2/maven-api-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/4.0.0-rc-2/maven-artifact-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-bom/4.0.0-alpha-9/maven-bom-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-builder-support/4.0.0-rc-2/maven-builder-support-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/4.0.0-rc-2/maven-compat-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/4.0.0-rc-2/maven-core-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-di/4.0.0-rc-2/maven-di-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-impl/4.0.0-rc-2/maven-impl-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-jline/4.0.0-rc-2/maven-jline-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-logging/4.0.0-rc-2/maven-logging-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/4.0.0-rc-2/maven-model-builder-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/4.0.0-rc-2/maven-model-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/19/maven-parent-19.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/41/maven-parent-41.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/43/maven-parent-43.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/4.0.0-rc-2/maven-plugin-api-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project-builder/3.0-alpha-2/maven-project-builder-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/3.0-alpha-2/maven-project-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/4.0.0-rc-2/maven-repository-metadata-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-resolver-provider/4.0.0-rc-2/maven-resolver-provider-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/4.0.0-rc-2/maven-settings-builder-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/4.0.0-rc-2/maven-settings-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain-builder/4.0.0-rc-2/maven-toolchain-builder-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-toolchain-model/4.0.0-rc-2/maven-toolchain-model-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-xml-impl/4.0.0-alpha-9/maven-xml-impl-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-xml/4.0.0-rc-2/maven-xml-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0-alpha-2/maven-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/4.0.0-alpha-9/maven-4.0.0-alpha-9.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/4.0.0-rc-2/maven-4.0.0-rc-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/2.0.5/maven-resolver-api-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-connector-basic/2.0.5/maven-resolver-connector-basic-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-impl/2.0.5/maven-resolver-impl-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-named-locks/2.0.5/maven-resolver-named-locks-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-spi/2.0.5/maven-resolver-spi-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-transport-apache/2.0.5/maven-resolver-transport-apache-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-transport-file/2.0.5/maven-resolver-transport-file-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/2.0.5/maven-resolver-util-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/2.0.5/maven-resolver-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/1.0-beta-6/wagon-file-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/3.5.3/wagon-file-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/wagon-http-lightweight-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/3.5.3/wagon-http-lightweight-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/wagon-http-shared-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/3.5.3/wagon-http-shared-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/1.0-beta-6/wagon-providers-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/3.5.3/wagon-providers-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/3.5.3/wagon-provider-api-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/3.5.3/wagon-3.5.3.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/4.26/xbean-reflect-4.26.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean/4.26/xbean-4.26.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-core/1.7.1/assertj-core-1.7.1.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-core/3.8.0/assertj-core-3.8.0.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-parent-pom/1.2.6/assertj-parent-pom-1.2.6.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-parent-pom/2.1.6/assertj-parent-pom-2.1.6.pom
 https://repo.maven.apache.org/maven2/org/bitbucket/b_c/jose4j/0.7.0/jose4j-0.7.0.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom
+https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.pom
@@ -1135,7 +1354,8 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.48.2/checker-qual-3.48.2.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.49.0/checker-qual-3.49.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1155,7 +1375,50 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-paren
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/50/mojo-parent-50.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/84/mojo-parent-84.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.8.0/plexus-classworlds-2.8.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.6/plexus-component-annotations-1.5.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.2.0/plexus-component-annotations-2.2.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.6/plexus-containers-1.5.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.0/plexus-containers-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.1/plexus-containers-2.1.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.2.0/plexus-containers-2.2.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/2.1.1/plexus-container-default-2.1.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity-api/1.3/plexus-interactivity-api-1.3.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interactivity/1.3/plexus-interactivity-1.3.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.27/plexus-interpolation-1.27.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-sec-dispatcher/4.1.0/plexus-sec-dispatcher-4.1.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.18/plexus-utils-3.0.18.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/4.0.2/plexus-utils-4.0.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-xml/4.0.4/plexus-xml-4.0.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/6.5/plexus-6.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/16/plexus-16.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/18/plexus-18.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/19/plexus-19.pom
 https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.2/stax2-api-4.2.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/woodstox/wstx-asl/3.2.6/wstx-asl-3.2.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/woodstox/wstx-asl/4.0.6/wstx-asl-4.0.6.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.5.0/easymock-parent-5.5.0.pom
@@ -1169,10 +1432,14 @@ https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.9/project-1.0.9.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
+https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-bom/12.1.0.alpha1/jetty-bom-12.1.0.alpha1.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.0.202109080827-r/org.eclipse.jgit-parent-5.13.0.202109080827-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.1.202206130422-r/org.eclipse.jgit-parent-5.13.1.202206130422-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.1.202206130422-r/org.eclipse.jgit-5.13.1.202206130422-r.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M3/org.eclipse.sisu.inject-0.9.0.M3.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.9.0.M3/org.eclipse.sisu.plexus-0.9.0.M3.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-inject/0.9.0.M3/sisu-inject-0.9.0.M3.pom
 https://repo.maven.apache.org/maven2/org/fusesource/fusesource-pom/1.11/fusesource-pom-1.11.pom
 https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-project/1.18/jansi-project-1.18.pom
 https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.pom
@@ -1189,8 +1456,11 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
+https://repo.maven.apache.org/maven2/org/greenrobot/eventbus-java/3.3.1/eventbus-java-3.3.1.pom
+https://repo.maven.apache.org/maven2/org/greenrobot/eventbus/3.3.1/eventbus-3.3.1.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0/hamcrest-core-3.0.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0/hamcrest-3.0.pom
@@ -1199,6 +1469,7 @@ https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jaco
 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.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/jboss/weld/weld-parent/36/weld-parent-36.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
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0.pom
@@ -1206,24 +1477,32 @@ https://repo.maven.apache.org/maven2/org/jetbrains/dokka/dokka-core/1.4.32/dokka
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu-jvm/0.16.3/atomicfu-jvm-0.16.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu-jvm/0.17.3/atomicfu-jvm-0.17.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.16.3/atomicfu-0.16.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.17.3/atomicfu-0.17.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.1/kotlinx-coroutines-android-1.6.1.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.7.3/kotlinx-coroutines-android-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.1/kotlinx-coroutines-bom-1.6.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.3/kotlinx-coroutines-bom-1.6.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.4/kotlinx-coroutines-bom-1.6.4.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.7.3/kotlinx-coroutines-bom-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.1/kotlinx-coroutines-core-jvm-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.0/kotlinx-coroutines-core-jvm-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.1/kotlinx-coroutines-core-jvm-1.6.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.3/kotlinx-coroutines-core-jvm-1.6.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.3/kotlinx-coroutines-core-jvm-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1/kotlinx-coroutines-core-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.1/kotlinx-coroutines-core-1.6.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.3/kotlinx-coroutines-core-1.6.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.4/kotlinx-coroutines-core-1.6.4.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.7.3/kotlinx-coroutines-core-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-play-services/1.6.4/kotlinx-coroutines-play-services-1.6.4.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-play-services/1.7.3/kotlinx-coroutines-play-services-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.8.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.20/kotlin-android-extensions-1.6.20.pom
@@ -1285,7 +1564,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.0/kotlin-reflect-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.20-Beta2/kotlin-reflect-2.1.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.9.0/kotlin-scripting-common-1.9.0.pom
@@ -1321,6 +1600,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.20/kotlin-stdlib-common-1.7.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.21/kotlin-stdlib-common-1.7.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20-RC2/kotlin-stdlib-common-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20/kotlin-stdlib-common-1.8.20.pom
@@ -1341,10 +1623,13 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21/kotlin-stdlib-jdk7-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.20/kotlin-stdlib-jdk7-1.7.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20-RC2/kotlin-stdlib-jdk7-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20/kotlin-stdlib-jdk7-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
@@ -1359,10 +1644,13 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21/kotlin-stdlib-jdk8-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.20/kotlin-stdlib-jdk8-1.7.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.22/kotlin-stdlib-jdk8-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20-RC2/kotlin-stdlib-jdk8-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20/kotlin-stdlib-jdk8-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
@@ -1387,6 +1675,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.20/kotlin-stdlib-1.7.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.21/kotlin-stdlib-1.7.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-RC2/kotlin-stdlib-1.8.20-RC2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20/kotlin-stdlib-1.8.20.pom
@@ -1394,8 +1685,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.22/kotlin-stdlib-1.9.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.25/kotlin-stdlib-1.9.25.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.0/kotlin-stdlib-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.20-Beta2/kotlin-stdlib-2.1.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
@@ -1408,22 +1699,36 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.9.0
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-jvm-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
+https://repo.maven.apache.org/maven2/org/jline/jansi-core/3.29.0/jansi-core-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-builtins/3.29.0/jline-builtins-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-console-ui/3.29.0/jline-console-ui-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-native/3.29.0/jline-native-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-parent/3.29.0/jline-parent-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-reader/3.29.0/jline-reader-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-style/3.29.0/jline-style-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jni/3.29.0/jline-terminal-jni-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.29.0/jline-terminal-3.29.0.pom
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
-https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
+https://repo.maven.apache.org/maven2/org/json/json/20250107/json-20250107.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.3/junit-bom-5.11.3.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.2/junit-bom-5.10.2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.12.0-M1/junit-bom-5.12.0-M1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-bom/5.15.2/mockito-bom-5.15.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.28.2/mockito-core-2.28.2.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.14.2/mockito-core-5.14.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.15.2/mockito-core-5.15.2.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis-parent-2.6.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.4/objenesis-parent-3.4.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.4/objenesis-3.4.pom
@@ -1474,18 +1779,31 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7.1/asm-9.7.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
+https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.3/annotations-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.7.3/annotations-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/junit/4.3/junit-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/junit/4.7.3/junit-4.7.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/nativeruntime/4.7.3/nativeruntime-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.3/pluginapi-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.7.3/pluginapi-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.3/plugins-maven-dependency-resolver-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.7.3/plugins-maven-dependency-resolver-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/resources/4.3/resources-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/resources/4.7.3/resources-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.3/robolectric-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.7.3/robolectric-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.3/sandbox-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.7.3/sandbox-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.3/shadowapi-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.7.3/shadowapi-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.3/shadows-framework-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.7.3/shadows-framework-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.3/utils-reflector-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.7.3/utils-reflector-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils/4.3/utils-4.3.pom
 https://repo.maven.apache.org/maven2/org/robolectric/utils/4.7.3/utils-4.7.3.pom
+https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.1.0-alpha1/jcl-over-slf4j-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/jul-to-slf4j/2.1.0-alpha1/jul-to-slf4j-2.1.0-alpha1.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.1.0-alpha1/slf4j-api-2.1.0-alpha1.pom
@@ -1493,11 +1811,36 @@ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.1.0-alpha1/slf4j-bom-
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.21/slf4j-parent-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.1.0-alpha1/slf4j-parent-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/2.1.0-alpha1/slf4j-simple-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/5/buildsupport-5.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/12/buildsupport-12.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/public-parent/5/public-parent-5.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/public-parent/12/public-parent-12.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/3/forge-parent-3.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/38/forge-parent-38.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/cglib/3.1.1/cglib-3.1.1.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-parent/4.2.0/guice-parent-4.2.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/wrappers/2.6.0/wrappers-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/4.2.0/sisu-guice-4.2.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/2.6.0/sisu-inject-bean-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/2.6.0/sisu-inject-plexus-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/2.6.0/sisu-inject-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/2.6.0/sisu-parent-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/model-builder/1.10/model-builder-1.10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/10/spice-parent-10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
 https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata/0.1.0-rc1/tensorflow-lite-metadata-0.1.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata/0.1.0-rc2/tensorflow-lite-metadata-0.1.0-rc2.pom
+https://repo.maven.apache.org/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.pom
+https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom
 https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.pom
+https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom
 https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom

nix/deps/gradle/deps_hack.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Fallback versions for each dependency
+readonly FOOJAY_FALLBACK="0.5.0"
+readonly KOTLIN_FALLBACK="1.8.0"
+readonly TOOLS_FALLBACK="3.5.4"
+readonly HERMES_FALLBACK="0.73.5"
+
+GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+cd "${GIT_ROOT}"
+
+get_version() {
+    local file="$1"
+    local pattern="$2"
+    local fallback="$3"
+    local version
+
+    if [[ ! -f "$file" ]]; then
+        echo "$fallback"
+        return 0
+    fi
+
+    version=$(grep "$pattern" "$file" 2>/dev/null | grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.*[0-9]*" | tail -n1 || echo "$fallback")
+    echo "$version"
+}
+
+foojay_version=$(get_version "./node_modules/@react-native/gradle-plugin/settings.gradle.kts" "foojay.*version" "$FOOJAY_FALLBACK")
+kotlin_version=$(get_version "./node_modules/@react-native/gradle-plugin/gradle/libs.versions.toml" "kotlin =" "$KOTLIN_FALLBACK")
+tools_version=$(get_version "./patches/BlurView-build.gradle.patch" "gradle:" "$TOOLS_FALLBACK")
+hermes_version=$(get_version "./node_modules/react-native/ReactAndroid/gradle.properties" "VERSION_NAME" "$HERMES_FALLBACK")
+
+
+cat << EOF
+org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:$foojay_version
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlin_version
+com.android.tools.build:gradle:$tools_version
+com.facebook.react:hermes-android:$hermes_version
+EOF

nix/deps/gradle/generate.sh

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

nix/deps/gradle/get_deps.sh

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

nix/deps/gradle/proj.list

@@ -1,4 +1,5 @@
 app
+notifee_react-native
 react-native-async-storage_async-storage
 react-native-background-timer
 react-native-biometrics
@@ -14,6 +15,8 @@ react-native-community_slider
 react-native-config
 react-native-dialogs
 react-native-fast-image
+react-native-firebase_app
+react-native-firebase_messaging
 react-native-fs
 react-native-gesture-handler
 react-native-get-random-values
@@ -25,6 +28,7 @@ react-native-linear-gradient
 react-native-lottie-splash-screen
 react-native-navigation
 react-native-nfc-manager
+react-native-notifications
 react-native-orientation-locker
 react-native-pdf
 react-native-permissions

nix/status-go/source.nix

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

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "@ethersproject/shims": "^5.7.0",
     "@json-rpc-tools/utils": "^1.7.6",
+    "@notifee/react-native": "^9.1.8",
     "@react-native-async-storage/async-storage": "1.19.3",
     "@react-native-camera-roll/camera-roll": "7.5.2",
     "@react-native-clipboard/clipboard": "1.13.2",
@@ -20,8 +21,10 @@
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
-    "@walletconnect/react-native-compat": "2.17.3",
+    "@react-native-firebase/app": "^21.7.2",
+    "@react-native-firebase/messaging": "^21.7.2",
     "@reown/walletkit": "^1.0.0",
+    "@walletconnect/react-native-compat": "2.17.3",
     "base-64": "^1.0.0",
     "big-integer": "1.6.51",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
@@ -57,6 +60,7 @@
     "react-native-linear-gradient": "3.0.0-alpha.1",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-navigation": "7.39.0",
+    "react-native-notifications": "^5.1.0",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-pdf": "^6.7.5",
     "react-native-permissions": "4.1.5",

scripts/build-android.sh

@@ -54,6 +54,11 @@ for SECRET_VAR_NAME in "${SECRETS_ENV_VARS[@]}"; do
     [[ -n "${!SECRET_VAR_NAME}" ]] && append_env_export "${SECRET_VAR_NAME}"
 done
 
+# Used by Clojure at compile time for remove import of react-native-notifications for fdroid release
+if [[ -n "${READER_FEATURES}" ]]; then
+    append_env_export 'READER_FEATURES'
+fi
+
 # If no secrets were passed there's no need to pass the 'secretsFile'.
 if [[ -s "${SECRETS_FILE_PATH}" ]]; then
   nixOpts+=("--option" "extra-sandbox-paths" "${SECRETS_FILE_PATH}")

scripts/google-free.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Used by Clojure to condition code and Gradle to make dependencies optional
+sed -i -e '$aGOOGLE_FREE=1' .env.release
+
+# remove react-native-notifications(uses google dependencies) and google-services.json for the fdroid-build
+yarn remove react-native-notifications
+rm android/app/google-services.json

shadow-cljs.edn

@@ -103,7 +103,9 @@
                        ;; instrumenting functions.
                        :static-fns         false
                        :infer-externs      true
-                       :reader-features    #{:mobile}}
+                       :reader-features    #{:mobile
+                                             #shadow/env ["READER_FEATURES" :as :keyword :default
+                                                          :cljs]}}
     ;; if you want to use a real device, set your local ip
     ;; in the SHADOW_HOST env variable to make sure that
     ;; it will use the right interface

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

@@ -5,6 +5,7 @@
     [legacy.status-im.ui.components.list.views :as list]
     [quo.core :as quo]
     [re-frame.core :as re-frame]
+    [status-im.config :as config]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf])
   (:require-macros [legacy.status-im.utils.views :as views]))
@@ -46,6 +47,13 @@
      :on-press
      #(re-frame/dispatch [:open-modal :rpc-usage-info])
      :chevron true}
+    (when-not config/google-free
+      {:size :small
+       :title (i18n/label :t/notification-settings)
+       :accessibility-label :advanced-notification-settings
+       :on-press
+       #(re-frame/dispatch [:navigate-to :notifications-advanced-settings])
+       :chevron true})
     {:size :small
      :title (i18n/label :t/peers-stats)
      :accessibility-label :peers-stats

src/legacy/status_im/ui/screens/notifications_settings/events.cljs

@@ -1,6 +1,7 @@
 (ns legacy.status-im.ui.screens.notifications-settings.events
   (:require
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
+    [react-native.platform :as platform]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
@@ -48,9 +49,67 @@
 
 (rf/defn notification-switch
   {:events [:push-notifications/switch]}
-  [cofx enabled?]
-  (rf/merge cofx
-            (if enabled?
-              {:effects/push-notifications-enable nil}
-              {:effects/push-notifications-disable nil})
-            (multiaccounts.update/multiaccount-update :notifications-enabled? enabled? {})))
+  [{:keys [db] :as cofx} desired-settings]
+  (let [profile (:profile/profile db)
+        prev-settings {:notifications-enabled?             (:notifications-enabled? profile)
+                       :local-push-notifications-enabled?  (:local-push-notifications-enabled? profile)
+                       :remote-push-notifications-enabled? (:remote-push-notifications-enabled? profile)}
+        next-settings
+        (cond
+          (and (:notifications-enabled? desired-settings)
+               (not (:notifications-enabled? prev-settings)))
+          (if platform/android?
+            {:notifications-enabled?             true
+             :local-push-notifications-enabled?  false
+             :remote-push-notifications-enabled? false}
+            {:notifications-enabled?             true
+             :local-push-notifications-enabled?  true
+             :remote-push-notifications-enabled? true})
+
+          (and (= false (:notifications-enabled? desired-settings))
+               (:notifications-enabled? prev-settings))
+          {:notifications-enabled?             false
+           :local-push-notifications-enabled?  false
+           :remote-push-notifications-enabled? false}
+
+          :else
+          {:notifications-enabled? (:notifications-enabled? prev-settings)
+           :local-push-notifications-enabled?
+           (if (nil? (:local-push-notifications-enabled? desired-settings))
+             (:local-push-notifications-enabled? prev-settings)
+             (:local-push-notifications-enabled? desired-settings))
+           :remote-push-notifications-enabled?
+           (if (nil? (:remote-push-notifications-enabled? desired-settings))
+             (:remote-push-notifications-enabled? prev-settings)
+             (:remote-push-notifications-enabled? desired-settings))})
+        enable-remote? (and (not (:remote-push-notifications-enabled? prev-settings))
+                            (:remote-push-notifications-enabled? next-settings))
+        enable-local? (and (not (:local-push-notifications-enabled? prev-settings))
+                           (:local-push-notifications-enabled? next-settings))
+        disable-local? (and (:local-push-notifications-enabled? prev-settings)
+                            (not (:local-push-notifications-enabled? next-settings)))
+        disable-remote? (and (:remote-push-notifications-enabled? prev-settings)
+                             (not (:remote-push-notifications-enabled? next-settings)))
+        any-disabled? (or disable-local? disable-remote?)]
+    (rf/merge
+     cofx
+     (if (and (:notifications-enabled? next-settings) (not any-disabled?))
+       {:effects/push-notifications-enable (cond-> {}
+                                             enable-remote?
+                                             (assoc :enable-remote? true)
+                                             enable-local?
+                                             (assoc :enable-local? true))}
+       {:effects/push-notifications-disable (cond-> {}
+                                              disable-remote?
+                                              (assoc :disable-remote? true)
+                                              disable-local?
+                                              (assoc :disable-local? true))})
+     (multiaccounts.update/multiaccount-update :notifications-enabled?
+                                               (:notifications-enabled? next-settings)
+                                               {})
+     (multiaccounts.update/multiaccount-update :local-push-notifications-enabled?
+                                               (:local-push-notifications-enabled? next-settings)
+                                               {})
+     (multiaccounts.update/multiaccount-update :remote-push-notifications-enabled?
+                                               (:remote-push-notifications-enabled? next-settings)
+                                               {}))))

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

@@ -6,11 +6,12 @@
     [legacy.status-im.ui.components.react :as react]
     [quo.core :as quo]
     [react-native.platform :as platform]
+    [status-im.config :as config]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn notifications-settings-ios
+(defn remote-notifications
   []
   (let [{:keys [notifications-enabled?
                 push-notifications-block-mentions?
@@ -22,7 +23,8 @@
        :title               (i18n/label :t/show-notifications)
        :accessibility-label :notifications-button
        :active              notifications-enabled?
-       :on-press            #(rf/dispatch [:push-notifications/switch (not notifications-enabled?)])
+       :on-press            #(rf/dispatch [:push-notifications/switch
+                                           {:notifications-enabled? (not notifications-enabled?)}])
        :accessory           :switch}]
      [components/separator
       {:color (:ui-02 @colors/theme)
@@ -49,25 +51,45 @@
                                (not push-notifications-block-mentions?)])
        :accessory           :switch}]]))
 
+(def notifications-settings-ios remote-notifications)
+
 (defn notifications-settings-android
   []
-  (let [{:keys [notifications-enabled?]} (rf/sub [:profile/profile])]
+  (let [{:keys [notifications-enabled?
+                local-push-notifications-enabled?
+                remote-push-notifications-enabled?]} (rf/sub [:profile/profile])]
     [:<>
+     [list.item/list-item
+      {:title               (i18n/label :t/show-notifications)
+       :accessibility-label :show-notifications-settings-button
+       :active              notifications-enabled?
+       :on-press            (fn []
+                              (rf/dispatch [:push-notifications/switch
+                                            {:notifications-enabled? (not notifications-enabled?)}]))
+       :accessory           :switch}]
      [list.item/list-item
       {:title               (i18n/label :t/local-notifications)
        :accessibility-label :local-notifications-settings-button
        :subtitle            (i18n/label :t/local-notifications-subtitle)
-       :active              notifications-enabled?
+       :disabled            (not notifications-enabled?)
+       :active              local-push-notifications-enabled?
        :on-press            (fn []
-                              (when-not notifications-enabled?
-                                (rf/dispatch
-                                 [:request-permissions
-                                  {:permissions [:post-notifications]
-                                   :on-allowed  #(log/info "push notification permissions were allowed")
-                                   :on-denied   #(log/error
-                                                  "user denied push notification permissions")}]))
-                              (rf/dispatch [:push-notifications/switch (not notifications-enabled?)]))
-       :accessory           :switch}]]))
+                              (rf/dispatch [:push-notifications/switch
+                                            {:local-push-notifications-enabled?
+                                             (not local-push-notifications-enabled?)}]))
+       :accessory           :switch}]
+     (when-not config/google-free
+       [list.item/list-item
+        {:title               (i18n/label :t/remote-notifications)
+         :accessibility-label :remote-notifications-settings-button
+         :subtitle            (i18n/label :t/remote-notifications-subtitle)
+         :disabled            (not notifications-enabled?)
+         :active              remote-push-notifications-enabled?
+         :on-press            (fn []
+                                (rf/dispatch [:push-notifications/switch
+                                              {:remote-push-notifications-enabled?
+                                               (not remote-push-notifications-enabled?)}]))
+         :accessory           :switch}])]))
 
 (defn notifications-settings
   []

src/native_module/push_notifications.cljs

@@ -16,6 +16,10 @@
   [chat-id]
   (.clearMessageNotifications ^js (push-notification) chat-id))
 
+(defn clear-all-message-notifications
+  []
+  (.clearAllMessageNotifications ^js (push-notification)))
+
 (defn create-channel
   [{:keys [channel-id channel-name]}]
   (.createChannel ^js (push-notification)

src/quo/components/blur/view.cljs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -131,7 +131,7 @@
          :char-limit     char-limit
          :theme          theme}])
      [rn/view
-      {:style (merge (style/input-container colors-by-status small? disabled?) input-container-style)}
+      {:style [(style/input-container colors-by-status small? disabled?) input-container-style]}
       (when-let [{:keys [icon-name]} left-icon]
         [left-accessory
          {:variant-colors variant-colors

src/quo/components/keycard/component_spec.cljs

@@ -4,11 +4,7 @@
     [test-helpers.component :as h]))
 
 (h/describe "keycard component"
-  (h/test "Render of keycard component when: holder-name prop is not set"
-    (h/render [keycard/keycard])
-    (h/is-truthy (h/get-by-translation-text :t/empty-keycard)))
-
-  (h/test "Render of keycard component when: holder-name prop is set"
-    (let [holder-name "Alisha"]
+  (let [holder-name "Alisha"]
+    (h/test "Render of keycard component when: holder-name prop is set"
       (h/render [keycard/keycard {:holder-name holder-name}])
       (h/is-truthy (h/get-by-translation-text :t/user-keycard {:name holder-name})))))

src/quo/components/keycard/style.cljs

@@ -6,21 +6,21 @@
 (def keycard-chip-height 28)
 
 (defn card-container
-  [locked? theme]
+  [locked? theme blur?]
   {:overflow         :hidden
    :height           keycard-height
    :align-items      :flex-start
    :justify-content  :space-between
    :border-width     1
-   :border-color     (if locked?
+   :border-color     (if (or locked? blur?)
                        colors/white-opa-5
                        (colors/theme-colors colors/neutral-20 colors/neutral-80 theme))
    :border-style     :solid
    :border-radius    16
    :padding          16
    :background-color (if locked?
-                       (colors/theme-colors colors/danger colors/danger-opa-40 theme)
-                       (colors/theme-colors colors/neutral-5 colors/neutral-90 theme))})
+                       (colors/theme-colors colors/danger-50 colors/danger-50-opa-40 theme)
+                       colors/keycard-color)})
 
 (defn keycard-logo
   [locked? theme]
@@ -28,18 +28,6 @@
                  colors/white
                  (colors/theme-colors colors/neutral-100 colors/white theme))})
 
-(defn keycard-watermark
-  [locked? theme]
-  {:position   :absolute
-   :tint-color (if locked?
-                 colors/white-opa-5
-                 (colors/theme-colors colors/neutral-100 colors/white theme))
-   :align-self :center
-   :height     280.48
-   :transform  [{:rotate "-30deg"} {:translateY -30}]
-   :opacity    (when-not locked? 0.02)
-   :z-index    1})
-
 (def keycard-chip
   {:height   keycard-chip-height
    :position :absolute

src/quo/components/keycard/view.cljs

@@ -1,5 +1,6 @@
 (ns quo.components.keycard.view
   (:require
+    [clojure.string :as string]
     [quo.components.keycard.style :as style]
     [quo.components.tags.tag :as tag]
     [quo.foundations.colors :as colors]
@@ -14,12 +15,9 @@
   - :locked? - Boolean to specify whether the keycard is locked or not
   - :theme :light/:dark
   "
-  [{:keys [holder-name locked?]}]
-  (let [theme (quo.theme/use-theme)
-        label (if holder-name
-                (i18n/label :t/user-keycard {:name holder-name})
-                (i18n/label :t/empty-keycard))]
-    [rn/view {:style (style/card-container locked? theme)}
+  [{:keys [holder-name locked? blur?]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style (style/card-container locked? theme blur?)}
      [rn/image
       {:source (resources/get-image :keycard-logo)
        :style  (style/keycard-logo locked? theme)}]
@@ -27,16 +25,14 @@
       {:source (resources/get-image
                 (if (or locked? (= :dark theme)) :keycard-chip-dark :keycard-chip-light))
        :style  style/keycard-chip}]
-     [rn/image
-      {:source (resources/get-image :keycard-watermark)
-       :style  (style/keycard-watermark locked? theme)}]
-     [tag/tag
-      {:size                32
-       :type                (when locked? :icon)
-       :label               label
-       :labelled?           true
-       :blurred?            true
-       :resource            (when locked? :i/locked)
-       :accessibility-label :holder-name
-       :icon-color          colors/white-70-blur
-       :override-theme      (when locked? :dark)}]]))
+     (when-not (string/blank? holder-name)
+       [tag/tag
+        {:size                32
+         :type                (when locked? :icon)
+         :label               (i18n/label :t/user-keycard {:name holder-name})
+         :labelled?           true
+         :blurred?            true
+         :resource            (when locked? :i/locked)
+         :accessibility-label :holder-name
+         :icon-color          colors/white-70-blur
+         :override-theme      (when locked? :dark)}])]))

src/quo/components/list_items/account_list_card/component_spec.cljs

@@ -15,7 +15,6 @@
   (h/test "Test icon renders for ':action :icon'"
     (h/render-with-theme-provider [account-list-card/view
                                    {:account-props    account-props
-                                    :network          :ethereum
                                     :action           :icon
                                     :on-options-press (fn [])}])
     (h/is-truthy (h/get-by-label-text :icon))))

src/quo/components/list_items/account_list_card/view.cljs

@@ -12,7 +12,7 @@
     [schema.core :as schema]))
 
 (defn- internal-view
-  [{:keys [action blur? account-props networks on-press on-options-press]}]
+  [{:keys [action blur? account-props on-press on-options-press]}]
   (let [theme             (quo.theme/use-theme)
         [state set-state] (rn/use-state :default)
         on-press-in       (rn/use-callback #(set-state :pressed))
@@ -31,10 +31,9 @@
          :size   :paragraph-2}
         (:name account-props)]
        [address-text/view
-        {:blur?    blur?
-         :networks networks
-         :address  (:address account-props)
-         :format   :short}]]]
+        {:blur?   blur?
+         :address (:address account-props)
+         :format  :short}]]]
      (when (= action :icon)
        [rn/pressable {:on-press on-options-press}
         [icon/icon :i/options

src/quo/components/messages/gap.cljs

@@ -48,7 +48,7 @@
                            :margin-left        -4}
                           (if (= type :top)
                             {:top 0}
-                            {:transform [{:rotateZ "180deg"}]
+                            {:transform [{:rotate-z "180deg"}]
                              :bottom    0})
                           style)}]))
 

src/quo/components/onboarding/small_option_card/view.cljs

@@ -35,7 +35,7 @@
      subtitle]]])
 
 (defn- main-variant
-  [{:keys [title subtitle button-label image max-height accessibility-label on-press button-type]}]
+  [{:keys [title subtitle button-label image max-height accessibility-label on-press button-props]}]
   [rn/view {:style style/main-variant}
    [rn/view {:style style/main-variant-text-container}
     [text/text
@@ -56,18 +56,20 @@
      :resize-mode         :contain
      :source              image}]
    [button/button
-    {:on-press            on-press
-     :accessibility-label accessibility-label
-     :type                (or button-type :grey)
-     :size                40
-     :container-style     style/main-button
-     :theme               :dark
-     :background          :blur}
+    (merge
+     {:on-press            on-press
+      :accessibility-label accessibility-label
+      :type                :grey
+      :size                40
+      :container-style     style/main-button
+      :theme               :dark
+      :background          :blur}
+     button-props)
     button-label]])
 
 (defn small-option-card
   [{:keys [variant title subtitle button-label image max-height on-press accessibility-label
-           button-type container-style]
+           button-props container-style]
     :or   {variant :main accessibility-label :small-option-card}}]
   (let [main-variant?  (= variant :main)
         card-component (if main-variant? main-variant icon-variant)
@@ -84,4 +86,4 @@
        :accessibility-label accessibility-label
        :image               image
        :max-height          max-height
-       :button-type         button-type}]]))
+       :button-props        button-props}]]))

src/quo/components/settings/category/data_item/view.cljs

@@ -10,7 +10,7 @@
   [{:keys [label data container-style blur?]}]
   (let [theme     (quo.theme/use-theme)
         last-item (rn/use-memo #(last data) [data])]
-    [rn/view {:style (merge (style/container label) container-style)}
+    [rn/view {:style [(style/container label) container-style]}
      (when label
        [text/text
         {:weight :medium
@@ -29,4 +29,3 @@
          [data-item/view data-item-props]
          (when-not (= item last-item)
            [rn/view {:style (style/settings-separator blur? theme)}])])]]))
-

src/quo/components/settings/category/reorder/view.cljs

@@ -24,7 +24,7 @@
         separator                 (rn/use-memo (fn [] [rn/view
                                                        {:style (style/reorder-separator blur? theme)}])
                                                [blur? theme])]
-    [rn/view {:style (merge (style/container label) container-style)}
+    [rn/view {:style [(style/container label) container-style]}
      [text/text
       {:weight :medium
        :size   :paragraph-2

src/quo/components/settings/category/settings/view.cljs

@@ -11,7 +11,7 @@
   (let [theme          (quo.theme/use-theme)
         settings-items (remove nil? data)
         last-index     (dec (count settings-items))]
-    [rn/view {:style (merge (style/container label) container-style)}
+    [rn/view {:style [(style/container label) container-style]}
      (when label
        [text/text
         {:weight :medium

src/quo/components/share/qr_code/style.cljs

@@ -10,12 +10,7 @@
     {:flex 1}))
 
 (def avatar-overlay
-  {:position        :absolute
-   :top             0
-   :right           0
-   :left            0
-   :bottom          0
-   :justify-content :center
+  {:justify-content :center
    :align-items     :center})
 
 (defn qr-image

src/quo/components/share/qr_code/view.cljs

@@ -11,7 +11,7 @@
 (defn- avatar-image
   [{avatar-type :avatar
     :as         props}]
-  [rn/view {:style style/avatar-overlay}
+  [rn/view {:style [rn/stylesheet-absolute-fill style/avatar-overlay]}
    [rn/view
     {:style (case avatar-type
               :wallet-account style/avatar-container-rounded

src/quo/components/share/share_qr_code/component_spec.cljs

@@ -13,8 +13,6 @@
   {:type            :profile
    :profile-picture 123})
 
-(def wallet-props {:networks '(:ethereum)})
-
 (def text-press-event
   {:test-name           "Text pressed"
    :accessibility-label :share-qr-code-info-text
@@ -33,24 +31,6 @@
    :event-name          :press
    :callback-prop-key   :on-share-press})
 
-(def multichain-press-event
-  {:test-name           "Multichain tab pressed"
-   :accessibility-label :share-qr-code-multichain-tab
-   :event-name          :press
-   :callback-prop-key   :on-multichain-press})
-
-(def legacy-press-event
-  {:test-name           "Legacy tab pressed"
-   :accessibility-label :share-qr-code-legacy-tab
-   :event-name          :press
-   :callback-prop-key   :on-legacy-press})
-
-(def settings-press-event
-  {:test-name           "Settings pressed"
-   :accessibility-label :share-qr-code-settings
-   :event-name          :press
-   :callback-prop-key   :on-settings-press})
-
 (defn render-share-qr-code
   [props]
   ;; NOTE: rendering the profile type first, so that the re-render is triggered.
@@ -74,45 +54,22 @@
       (h/is-truthy (h/get-by-text qr-label)))
 
     (h/test "Wallet Legacy"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :wallet
-                                    :address :legacy}))
+      (render-share-qr-code (assoc default-props
+                                   :type
+                                   :wallet))
       (h/is-truthy (h/get-by-text qr-label)))
 
-    (h/test "Wallet multichain"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :wallet
-                                    :address :multichain}))
+    (h/test "Saved address"
+      (render-share-qr-code (assoc default-props
+                                   :type
+                                   :saved-address))
       (h/is-truthy (h/get-by-text qr-label)))
 
-    (h/test "Saved address legacy"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :saved-address
-                                    :address :legacy}))
-      (h/is-truthy (h/get-by-text qr-label)))
 
-    (h/test "Saved address multichain"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :saved-address
-                                    :address :multichain}))
-      (h/is-truthy (h/get-by-text qr-label)))
-
-    (h/test "Watched address legacy"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :watched-address
-                                    :address :legacy}))
-      (h/is-truthy (h/get-by-text qr-label)))
-
-    (h/test "Watched address multichain"
-      (render-share-qr-code (merge default-props
-                                   wallet-props
-                                   {:type    :watched-address
-                                    :address :multichain}))
+    (h/test "Watched address"
+      (render-share-qr-code (assoc default-props
+                                   :type
+                                   :watched-address))
       (h/is-truthy (h/get-by-text qr-label))))
 
   (h/describe "Fires all events for all types"
@@ -136,78 +93,27 @@
 
       (h/describe "Wallet Legacy"
         (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type    :wallet
-                 :address :legacy
-                 :emoji   "👻"})
+         (assoc default-props
+                :type  :wallet
+                :emoji "👻")
          [text-press-event
           text-long-press-event
-          share-press-event
-          multichain-press-event
-          legacy-press-event]))
+          share-press-event]))
 
-      (h/describe "Wallet Multichain"
+      (h/describe "Saved Address"
         (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type    :wallet
-                 :address :multichain
-                 :emoji   "👻"})
+         (assoc default-props
+                :type
+                :saved-address)
          [text-press-event
           text-long-press-event
-          share-press-event
-          legacy-press-event
-          multichain-press-event
-          settings-press-event]))
+          share-press-event]))
 
-      (h/describe "Saved Address Legacy"
+      (h/describe "Watched Address"
         (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type    :saved-address
-                 :address :legacy})
+         (assoc default-props
+                :type  :watched-address
+                :emoji "👽")
          [text-press-event
           text-long-press-event
-          share-press-event
-          legacy-press-event
-          multichain-press-event]))
-
-      (h/describe "Saved Address Multichain"
-        (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type :saved-address :address :multichain})
-         [text-press-event
-          text-long-press-event
-          share-press-event
-          legacy-press-event
-          multichain-press-event
-          settings-press-event]))
-
-      (h/describe "Watched Address Legacy"
-        (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type    :watched-address
-                 :address :legacy
-                 :emoji   "👽"})
-         [text-press-event
-          text-long-press-event
-          share-press-event
-          legacy-press-event
-          multichain-press-event]))
-
-      (h/describe "Watched Address Multichain"
-        (test-fire-events
-         (merge default-props
-                wallet-props
-                {:type    :watched-address
-                 :address :multichain
-                 :emoji   "👽"})
-         [text-press-event
-          text-long-press-event
-          share-press-event
-          legacy-press-event
-          multichain-press-event
-          settings-press-event])))))
+          share-press-event])))))

src/quo/components/share/share_qr_code/schema.cljs

@@ -1,10 +1,4 @@
-(ns quo.components.share.share-qr-code.schema
-  (:require
-    [quo.foundations.resources :as resources]))
-
-(defn- valid-network?
-  [network]
-  (-> network resources/get-network boolean))
+(ns quo.components.share.share-qr-code.schema)
 
 (def ?base
   [:map
@@ -35,25 +29,9 @@
    [:type [:= :wallet]]
    [:emoji {:optional true} [:maybe ?emoji]]])
 
-(def ?address-multichain
-  [:map
-   [:address [:= :multichain]]
-   [:on-settings-press {:optional true} fn?]])
-
-(def ?address-base
-  [:merge
-   [:map
-    [:networks [:sequential [:fn valid-network?]]]
-    [:on-legacy-press {:optional true} [:maybe fn?]]
-    [:on-multichain-press {:optional true} [:maybe fn?]]
-    [:address [:enum :legacy :multichain]]]
-   [:multi {:dispatch :address}
-    [:multichain ?address-multichain]]])
-
 (def ?saved-address
   [:map
-   [:type [:= :saved-address]]
-   [:on-settings-press {:optional true} fn?]])
+   [:type [:= :saved-address]]])
 
 (def ?watched-address
   [:map
@@ -67,8 +45,8 @@
      [:multi {:dispatch :type}
       [:channel [:merge ?base ?channel]]
       [:profile [:merge ?base ?profile]]
-      [:wallet [:merge ?base ?address-base ?wallet]]
-      [:saved-address [:merge ?base ?address-base ?saved-address]]
-      [:watched-address [:merge ?base ?address-base ?watched-address]]]]]
+      [:wallet [:merge ?base ?wallet]]
+      [:saved-address [:merge ?base ?saved-address]]
+      [:watched-address [:merge ?base ?watched-address]]]]]
    :any])
 

src/quo/components/share/share_qr_code/view.cljs

@@ -12,37 +12,12 @@
             [quo.components.share.qr-code.view :as qr-code]
             [quo.components.share.share-qr-code.schema :as component-schema]
             [quo.components.share.share-qr-code.style :as style]
-            [quo.components.tabs.tab.view :as tab]
-            [quo.components.wallet.address-text.view :as address-text]
             [quo.foundations.colors :as colors]
             [quo.theme]
             [react-native.core :as rn]
             [schema.core :as schema]
             [utils.i18n :as i18n]))
 
-(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
-     :active-item-container-style style/header-tab-active
-     :item-container-style        style/header-tab-inactive
-     :size                        24
-     :active                      (= :legacy address)
-     :on-press                    on-legacy-press}
-    (i18n/label :t/legacy)]])
-
 (defn- info-label
   [share-qr-code-type]
   [text/text {:size :paragraph-2 :weight :medium :style style/title}
@@ -86,7 +61,7 @@
      :on-long-press on-text-long-press}
     qr-data]])
 
-(defn- wallet-legacy-bottom
+(defn- wallet-bottom
   [{:keys [component-width qr-data on-text-press on-text-long-press]}]
   [info-text
    {:width         component-width
@@ -94,28 +69,6 @@
     :on-long-press on-text-long-press}
    qr-data])
 
-(defn wallet-multichain-bottom
-  [{:keys [component-width qr-data on-text-press on-text-long-press on-settings-press]}]
-  [rn/view
-   {:style style/wallet-multichain-container}
-   [info-text
-    {:width         component-width
-     :on-press      on-text-press
-     :on-long-press on-text-long-press}
-    [address-text/view
-     {:address       qr-data
-      :full-address? true
-      :weight        :regular
-      :size          :paragraph-1}]]
-   [button/button
-    {:icon-only?          true
-     :type                :grey
-     :background          :blur
-     :size                32
-     :accessibility-label :share-qr-code-settings
-     :on-press            on-settings-press}
-    :i/advanced]])
-
 (defn- header-icon
   [{:keys [share-qr-type customization-color emoji profile-picture full-name]}]
   (case share-qr-type
@@ -140,17 +93,9 @@
                                  :full-name           full-name}]
     nil))
 
-(defn- has-header?
-  [share-qr-type]
-  (case share-qr-type
-    (:wallet
-     :watched-address
-     :saved-address) true
-    false))
-
 (defn- share-qr-code
   [{:keys [share-qr-type qr-image-uri component-width customization-color full-name
-           profile-picture emoji on-share-press address]
+           profile-picture emoji on-share-press]
     :as   props}]
   [:<>
    [gradient-cover/view {:customization-color customization-color :height 463}]
@@ -168,8 +113,6 @@
          {:color           colors/white-opa-40
           :container-style style/watched-account-icon}])]
      [share-button {:on-press on-share-press}]]
-    (when (has-header? share-qr-type)
-      [header props])
     [quo.theme/provider :light
      [qr-code/view
       {:qr-image-uri        qr-image-uri
@@ -185,12 +128,12 @@
        :profile-picture     profile-picture
        :emoji               emoji}]]
     [rn/view {:style style/bottom-container}
-     (if (= share-qr-type :profile)
+     (case share-qr-type
+       :profile
        [profile-bottom props]
-       (case address
-         :legacy     [wallet-legacy-bottom props]
-         :multichain [wallet-multichain-bottom props]
-         nil))]]])
+       (:wallet :watched-address :saved-address)
+       [wallet-bottom props]
+       nil)]]])
 
 (defn- view-internal
   [{provided-width :width :as props}]

src/quo/components/tags/context_tag/view.cljs

@@ -97,7 +97,7 @@
            theme               (quo.theme/use-theme)}
     :as   props}]
   (let [[image-error? set-image-error] (rn/use-state false)]
-    [rn/view {:style (merge {:align-items :flex-start} container-style)}
+    [rn/view {:style [{:align-items :flex-start} container-style]}
      [rn/view
       {:style               (style/container {:theme               theme
                                               :type                type

src/quo/components/wallet/network_bridge/view.cljs

@@ -14,9 +14,9 @@
 (defn network-bridge-add
   [{:keys [network state theme container-style on-press]}]
   [rn/pressable
-   {:style    (merge (style/container network state theme)
-                     (style/add-container theme)
-                     container-style)
+   {:style    [(style/container network state theme)
+               (style/add-container theme)
+               container-style]
     :on-press on-press}
    [icon/icon :i/edit
     {:size  12
@@ -36,7 +36,7 @@
     (if (= status :edit)
       [network-bridge-add (assoc args :theme theme)]
       [rn/pressable
-       {:style               (merge (style/container network status theme) container-style)
+       {:style               [(style/container network status theme) container-style]
         :accessible          true
         :accessibility-label :container
         :on-press            on-press

src/quo/foundations/colors.cljs

@@ -195,17 +195,12 @@
 (def success-60-opa-30 (alpha success-60 0.3))
 (def success-60-opa-40 (alpha success-60 0.4))
 
-;;;;Danger
-(def danger "#E95460")
-
-;; Danger with transparency
-(def danger-opa-40 (alpha danger 0.4))
-
 ;;Solid
 (def danger-50 "#E95460")
 (def danger-60 "#BA434D")
 
 (def system-yellow "#FFD60A")
+(def keycard-color "#FF6400")
 
 ;;50 with transparency
 (def danger-50-opa-0 (alpha danger-50 0))

src/quo/foundations/resources.cljs

@@ -4,7 +4,6 @@
   {:keycard-logo       (js/require "../resources/images/ui2/keycard-logo.png")
    :keycard-chip-light (js/require "../resources/images/ui2/keycard-chip-light.png")
    :keycard-chip-dark  (js/require "../resources/images/ui2/keycard-chip-dark.png")
-   :keycard-watermark  (js/require "../resources/images/ui2/keycard-watermark.png")
    :bored-ape          (js/require "../resources/images/mock2/bored-ape.png")})
 
 (def ui-themed

src/react_native/core.cljs

@@ -211,3 +211,5 @@
 (def linking (.-Linking react-native))
 
 (defn open-url [link] (.openURL ^js linking link))
+
+(def stylesheet-absolute-fill ^js (.. react-native -StyleSheet -absoluteFill))

src/react_native/notifee.cljs

@@ -0,0 +1,80 @@
+(ns react-native.notifee
+  (:require
+    ["@notifee/react-native" :as notifee]
+    [clojure.string :as string]
+    [promesa.core :as promesa]))
+
+(def authorization-statuses (js->clj notifee/AuthorizationStatus))
+
+(defn- format-auth-status-helper
+  [auth-status]
+  (if (number? auth-status)
+    auth-status
+    (keyword (string/lower-case auth-status))))
+
+(defn- format-auth-status
+  [auth-status-key]
+  (->> (cond
+         (string? auth-status-key)  auth-status-key
+         (keyword? auth-status-key) (str (symbol auth-status-key))
+         :else                      (str auth-status-key))
+       (string/upper-case)
+       (get authorization-statuses)
+       (format-auth-status-helper)))
+
+(defn- notification-permissions->notification-permission-statuses
+  [notifee-permissions]
+  (let [permission-status (format-auth-status (.-authorizationStatus notifee-permissions))]
+    {:authorized?   (= permission-status :authorized)
+     :denied?       (= permission-status :denied)
+     :undetermined? (= permission-status :not_determined)
+     :provisional?  (= permission-status :provisional)}))
+
+(defn check-notification-permissions
+  []
+  (-> (.getNotificationSettings notifee/default)
+      (promesa/then (comp (fn [permissions] {:ok permissions})
+                          notification-permissions->notification-permission-statuses))
+      (promesa/catch (fn [error]
+                       {:error error}))))
+
+(defn request-notification-permissions
+  []
+  (-> (.requestPermission notifee/default)
+      (promesa/then (comp (fn [permissions] {:ok permissions})
+                          notification-permissions->notification-permission-statuses))
+      (promesa/catch (fn [error]
+                       {:error error}))))
+
+(defn request-notification-channel
+  [options]
+  (-> (.createChannel notifee/default (clj->js options))
+      (promesa/then (fn [channel-id]
+                      {:ok {:channel-id channel-id}}))
+      (promesa/catch (fn [error]
+                       {:error error}))))
+
+(defn display-notification
+  [options]
+  (.displayNotification notifee/default (clj->js options)))
+
+(defn cancel-displayed-notifications
+  ([]
+   (.cancelDisplayedNotifications notifee/default))
+  ([notification-ids]
+   (.cancelDisplayedNotifications notifee/default (clj->js notification-ids))))
+
+(comment
+  (-> (request-notification-permissions)
+      (promesa/then tap>)
+      (promesa/catch tap>))
+
+  (-> (request-notification-channel
+       {:id   "status-im-notifications-alt"
+        :name "Status push notifications Alt"})
+      (promesa/then tap>))
+
+  (display-notification
+   {:title   "Test title"
+    :body    "Test Body"
+    :android {:channelId "status-im-notifications-alt"}}))

src/react_native/permissions.cljs

@@ -1,7 +1,9 @@
 (ns react-native.permissions
   (:require
     ["react-native-permissions" :refer
-     [check PERMISSIONS requestMultiple requestNotifications RESULTS]]
+     [check checkNotifications PERMISSIONS requestMultiple requestNotifications RESULTS]]
+    [clojure.string :as string]
+    [promesa.core :as promesa]
     [react-native.platform :as platform]
     [taoensso.timbre :as log]))
 
@@ -62,3 +64,38 @@
                    (do
                      (on-denied response)
                      (log/debug "Notification permission were denied" response))))))))
+
+(defn- format-permission-status
+  [raw-permission-status]
+  (-> raw-permission-status string/lower-case keyword))
+
+(defn- notification-permissions->notification-permission-statuses
+  [raw-notification-permissions]
+  (let [notification-permissions (js->clj raw-notification-permissions
+                                          :keywordize-keys
+                                          true)
+        permission-status        (-> notification-permissions
+                                     :status
+                                     format-permission-status)]
+    {:authorized?   (= permission-status :granted)
+     :denied?       (= permission-status :blocked)
+     :undetermined? (= permission-status :denied)
+     :provisional?  (true? (-> notification-permissions
+                               :settings
+                               :provisional))}))
+
+(defn request-notification-permissions
+  [options]
+  (-> (requestNotifications (clj->js options))
+      (promesa/then (comp (fn [permissions] {:ok permissions})
+                          notification-permissions->notification-permission-statuses))
+      (promesa/catch (fn [error]
+                       {:error error}))))
+
+(defn check-notification-permissions
+  []
+  (-> (checkNotifications)
+      (promesa/then (comp (fn [permissions] {:ok permissions})
+                          notification-permissions->notification-permission-statuses))
+      (promesa/catch (fn [error]
+                       {:error error}))))

src/react_native/reanimated.cljs

@@ -21,9 +21,7 @@
     ["react-native-redash" :refer (withPause)]
     [react-native.flat-list :as rn-flat-list]
     [react-native.platform :as platform]
-    [react-native.utils :as rn.utils]
     [reagent.core :as reagent]
-    [utils.transforms :as transforms]
     [utils.worklets.core :as worklets.core]))
 
 (def ^:const default-duration 300)
@@ -36,13 +34,7 @@
 ;; Animated Components
 (def create-animated-component (comp reagent/adapt-react-class (.-createAnimatedComponent reanimated)))
 
-(def ^:private view* (reagent/adapt-react-class (.-View reanimated)))
-
-(defn view
-  [& argv]
-  (let [[reagent-props children] (rn.utils/get-props-and-children argv)
-        updated-props            (update reagent-props :style transforms/styles-with-vectors)]
-    (into [view* updated-props] children)))
+(def view (reagent/adapt-react-class (.-View reanimated)))
 
 (def scroll-view (reagent/adapt-react-class (.-ScrollView reanimated)))
 (def image (reagent/adapt-react-class (.-Image reanimated)))
@@ -186,4 +178,3 @@
                      (with-timing value
                                   (clj->js {:duration duration
                                             :easing   (default-easing)})))))
-

src/react_native/rn_notifications.cljs

@@ -0,0 +1,66 @@
+(ns react-native.rn-notifications
+  (:require
+    ["react-native-notifications" :refer (Notifications)]
+    [promesa.core :as promesa]
+    [react-native.platform :as platform]))
+
+(defn- create-registration-success-sub
+  [on-registered-success]
+  (.registerRemoteNotificationsRegistered
+   (.events Notifications)
+   (fn [^js event]
+     (on-registered-success (.-deviceToken event)))))
+
+(defn- create-registration-fail-sub
+  [on-registered-fail]
+  (.registerRemoteNotificationsRegistrationFailed
+   (.events Notifications)
+   (fn [^js event]
+     (on-registered-fail
+      {:error (ex-info "Failed to register for remote token"
+                       {:code (.-code event)
+                        :description (.-localizedDescription event)
+                        :domain (.-domain event)})}))))
+
+(defn- remove-registration-subs
+  [subscriptions]
+  (doseq [listener-sub subscriptions]
+    (.remove listener-sub)))
+
+(defn- start-registration
+  [options]
+  (.registerRemoteNotifications Notifications (clj->js options)))
+
+(defn- remote-token-registration-process
+  [options]
+  (let [state (atom {:subs []})]
+    (promesa/create
+     (fn [resolver rejector]
+       (let [on-finish-registration
+             (fn [result]
+               (remove-registration-subs (:subs @state))
+               (if (:error result)
+                 (rejector result)
+                 (resolver result)))]
+         (swap! state assoc
+                :subs [(create-registration-success-sub on-finish-registration)
+                       (create-registration-fail-sub on-finish-registration)])
+         (start-registration options))))))
+
+(defn request-remote-token
+  "Requests and registers a device token for remote push-notifications.
+   iOS devices will receive an APNS token,
+   and Android devices will receive a FCM token."
+  [options]
+  (-> (remote-token-registration-process options)
+      (promesa/then (fn [token] {:ok {:token token}}))))
+
+(comment
+  (-> (request-remote-token {})
+      (promesa/then tap>)
+      (promesa/catch tap>)))
+
+(defn abandon-permissions
+  []
+  (when platform/ios?
+    (.abandonPermissions (Notifications.ios))))

src/react_native/utils_test.cljs

@@ -0,0 +1,54 @@
+(ns react-native.utils-test
+  (:require
+    [cljs.test :refer [deftest is testing]]
+    [utils.reagent :as sut]))
+
+(sut/set-convert-props-in-vectors!)
+
+(deftest convert-prop-value-test
+  ;; `test-fn` transforms the result to be easily compared during testing
+  (let [test-fn (comp js->clj sut/convert-prop-value)]
+    (testing "camelCase keys are kept as is"
+      (let [props {:foo nil
+                   :bar nil}]
+        (is (= (update-keys props name)
+               (test-fn props)))))
+
+    (testing "kebab-case keys are transformed"
+      (let [props {:foo nil
+                   :bar nil}]
+        (is (= {"foo" nil
+                "bar" nil}
+               (test-fn props)))))
+
+    (testing "kebab-case keys are transformed when passed inside a vector"
+      (let [props-in-vector [{:foo nil
+                              :bar nil}]]
+        (is (= [{"foo" nil
+                 "bar" nil}]
+               (test-fn props-in-vector)))))
+
+    (testing "kebab-case keys are transformed recursively when the structure has vectors"
+      (let [props-with-vectors {:foo [{:foo-bar nil
+                                       :foo-baz nil}]
+                                :bar [{:bar-baz nil}
+                                      {:bar-qux nil}]}]
+        (is (= {"foo" [{"fooBar" nil
+                        "fooBaz" nil}]
+                "bar" [{"barBaz" nil} {"barQux" nil}]}
+               (test-fn props-with-vectors))))
+      (testing "Complex example"
+        (let [complex-props {:foo         [{:foo-bar nil :foo-baz nil}]
+                             :bar         [{:bar-baz nil} {:bar-qux nil}]
+                             :qux         {:foo-qux :bar-qux}
+                             :foo-bar-qux {:foo         [{:bar :qux}
+                                                         {:bar-qux nil}]
+                                           :foo-bar     :qux
+                                           :foo-bar-qux [:foo :bar :qux {:foo-bar :foo-bar}]}}]
+          (is (= {"foo"       [{"fooBar" nil "fooBaz" nil}]
+                  "bar"       [{"barBaz" nil} {"barQux" nil}]
+                  "qux"       {"fooQux" "bar-qux"}
+                  "fooBarQux" {"foo"       [{"bar" "qux"} {"barQux" nil}]
+                               "fooBar"    "qux"
+                               "fooBarQux" ["foo" "bar" "qux" {"fooBar" "foo-bar"}]}}
+                 (test-fn complex-props))))))))

src/status_im/common/home/banner/view.cljs

@@ -73,10 +73,10 @@
   [{:keys [scroll-ref tabs selected-tab on-tab-change scroll-shared-value content customization-color]}]
   (let [theme (quo.theme/use-theme)]
     [:<>
-     [:f> banner-card-blur-layer scroll-shared-value
-      [:f> banner-card-hiding-layer
+     [banner-card-blur-layer scroll-shared-value
+      [banner-card-hiding-layer
        (assoc content :scroll-shared-value scroll-shared-value :theme theme)]]
-     [:f> banner-card-tabs-layer
+     [banner-card-tabs-layer
       {:scroll-shared-value scroll-shared-value
        :selected-tab        selected-tab
        :tabs                tabs

src/status_im/common/resources.cljs

@@ -18,13 +18,13 @@
    :podcasts                      (js/require "../resources/images/ui2/podcasts.png")
    :generate-keys                 (js/require "../resources/images/ui2/generate-keys.png")
    :add-key-to-keycard            (js/require "../resources/images/ui2/add-key-to-keycard.png")
+   :import-key-to-keycard         (js/require "../resources/images/ui2/import-key-to-keycard.png")
    :ethereum-address              (js/require "../resources/images/ui2/ethereum-address.png")
    :use-keycard                   (js/require "../resources/images/ui2/keycard.png")
    :use-recovery-phrase           (js/require "../resources/images/ui2/recovery-phrase.png")
    :check-your-keycard            (js/require "../resources/images/ui2/check-your-keycard.png")
    :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
    :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
-   :keycard-watermark             (js/require "../resources/images/ui2/keycard-watermark.png")
    :keycard-buy                   (js/require "../resources/images/ui2/keycard-buy.png")
    :keycard-migration             (js/require "../resources/images/ui2/keycard-migration.png")
    :keycard-migration-failed      (js/require "../resources/images/ui2/keycard-migration-failed.png")

src/status_im/common/scan_qr_code/style.cljs

@@ -15,16 +15,7 @@
 
 (def flex-spacer {:flex 1})
 
-(def absolute-fill
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     0
-   :right    0})
-
-(def hole
-  (merge absolute-fill
-         {:z-index 2 :opacity 0.95}))
+(def hole {:z-index 2 :opacity 0.95})
 
 (defn root-container
   [padding-top]

src/status_im/common/scan_qr_code/view.cljs

@@ -174,10 +174,10 @@
                                                     :on-success-scan set-qr-code-succeeded
                                                     :on-failed-scan  set-rescan-timeout}))}]]
    [hole-view/hole-view
-    {:style style/hole
-     :holes [(assoc qr-view-finder :borderRadius 16)]}
+    {:style [rn/stylesheet-absolute-fill style/hole]
+     :holes [(assoc qr-view-finder :border-radius 16)]}
     [quo/blur
-     {:style            style/absolute-fill
+     {:style            rn/stylesheet-absolute-fill
       :blur-amount      10
       :blur-type        :transparent
       :overlay-color    colors/neutral-80-opa-80-blur

src/status_im/common/standard_authentication/events.cljs

@@ -10,16 +10,35 @@
     [utils.re-frame :as rf]
     [utils.security.core :as security]))
 
+(defn- partially-operable-accounts?
+  [accounts]
+  (->> accounts
+       vals
+       (some #(= :partially (:operable %)))
+       boolean))
+
+(rf/reg-event-fx :standard-auth/migrate-partially-operable-accounts
+ (fn [{:keys [db]} [{:keys [masked-password on-success]}]]
+   (let [on-auth-success-callback         #(on-success masked-password)
+         has-partially-operable-accounts? (-> (get-in db [:wallet :accounts])
+                                              partially-operable-accounts?)]
+     {:fx [(if has-partially-operable-accounts?
+             [:dispatch
+              [:wallet/make-partially-operable-accounts-fully-operable
+               {:password   masked-password
+                :on-success on-auth-success-callback
+                :on-error   on-auth-success-callback}]]
+             [:effects.standard-auth/on-auth-success on-auth-success-callback])]})))
+
 (defn- handle-password-success
-  [has-partially-operable-accounts? on-auth-success masked-password]
+  [{:keys [migrate-partially-operable-accounts? on-auth-success masked-password]}]
   (let [on-auth-success-callback #(on-auth-success masked-password)]
     (rf/dispatch [:standard-auth/set-success true])
     (rf/dispatch [:standard-auth/reset-login-password])
-    (if has-partially-operable-accounts?
-      (rf/dispatch [:wallet/make-partially-operable-accounts-fully-operable
-                    {:password   masked-password
-                     :on-success on-auth-success-callback
-                     :on-error   on-auth-success-callback}])
+    (if migrate-partially-operable-accounts?
+      (rf/dispatch [:standard-auth/migrate-partially-operable-accounts
+                    {:masked-password masked-password
+                     :on-success      on-auth-success}])
       (on-auth-success-callback))))
 
 (defn authorize
@@ -42,9 +61,10 @@
                     {:pin        pin
                      :on-success (fn [{:keys [encryption-public-key]}]
                                    (rf/dispatch [:keycard/disconnect])
-                                   (handle-password-success false
-                                                            on-auth-success
-                                                            (security/mask-data encryption-public-key)))
+                                   (handle-password-success {:migrate-partially-operable-accounts? false
+                                                             :on-auth-success on-auth-success
+                                                             :masked-password (security/mask-data
+                                                                               encryption-public-key)}))
                      :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error
                                                 %])}]))}]))}]]
         [:effects.biometric/check-if-available
@@ -85,7 +105,12 @@
         keycard? (get-in db [:profile/profile :keycard-pairing])]
     {:fx [(if keycard?
             [:keychain/get-keycard-keys [key-uid on-auth-success]]
-            [:keychain/get-user-password [key-uid on-auth-success]])
+            [:keychain/get-user-password
+             [key-uid
+              (fn [masked-password]
+                (rf/dispatch [:standard-auth/migrate-partially-operable-accounts
+                              {:masked-password masked-password
+                               :on-success      on-auth-success}]))]])
           [:dispatch [:standard-auth/set-success true]]
           [:dispatch [:standard-auth/reset-login-password]]]}))
 
@@ -108,15 +133,14 @@
 (defn- bottom-sheet-password-view
   [{:keys [on-press-biometric on-auth-success auth-button-icon-left auth-button-label]}]
   (fn []
-    (let [has-partially-operable-accounts? (rf/sub [:wallet/has-partially-operable-accounts?])]
-      [enter-password/view
-       {:on-enter-password   #(handle-password-success
-                               has-partially-operable-accounts?
-                               on-auth-success
-                               (security/hash-masked-password %))
-        :on-press-biometrics on-press-biometric
-        :button-icon-left    auth-button-icon-left
-        :button-label        auth-button-label}])))
+    [enter-password/view
+     {:on-enter-password   #(handle-password-success {:migrate-partially-operable-accounts? true
+                                                      :on-auth-success on-auth-success
+                                                      :masked-password (security/hash-masked-password
+                                                                        %)})
+      :on-press-biometrics on-press-biometric
+      :button-icon-left    auth-button-icon-left
+      :button-label        auth-button-label}]))
 
 (defn authorize-with-keycard
   [_ [{:keys [on-complete]}]]
@@ -155,6 +179,12 @@
    (when on-close
      (on-close success?))))
 
+(rf/reg-fx
+ :effects.standard-auth/on-auth-success
+ (fn [on-auth-success]
+   (when on-auth-success
+     (on-auth-success))))
+
 (rf/reg-event-fx
  :standard-auth/close
  (fn [{:keys [db]} [on-close]]

src/status_im/config.cljs

@@ -34,6 +34,8 @@
 (def mainnet-chain-explorer-link "https://etherscan.io/address/")
 (def optimism-mainnet-chain-explorer-link "https://optimistic.etherscan.io/address/")
 (def arbitrum-mainnet-chain-explorer-link "https://arbiscan.io/address/")
+(def base-mainnet-chain-explorer-link "https://basescan.org/address/")
+(def base-sepolia-chain-explorer-link "https://sepolia.basescan.org/address/")
 (def sepolia-chain-explorer-link "https://sepolia.etherscan.io/address/")
 (def optimism-sepolia-chain-explorer-link "https://sepolia-optimistic.etherscan.io/address/")
 (def arbitrum-sepolia-chain-explorer-link "https://sepolia.arbiscan.io/address/")
@@ -57,6 +59,8 @@
 (def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))
 (def cached-webviews-enabled? (enabled? (get-config :CACHED_WEBVIEWS_ENABLED 0)))
 
+(def google-free (enabled? (get-config :GOOGLE_FREE "0")))
+
 ;; NOTE: only disabled in releases
 (def blank-preview? (enabled? (get-config :BLANK_PREVIEW "1")))
 (def tooltip-events? (enabled? (get-config :TOOLTIP_EVENTS "0")))

src/status_im/contexts/chat/home/view.cljs

@@ -114,13 +114,17 @@
                                              {:scroll-input (oops/oget % "nativeEvent.contentOffset.y")
                                               :shared-value scroll-shared-value})}])))
 
+(defn- on-new-message-press
+  []
+  (let [main-event [:show-bottom-sheet {:content chat.actions.view/new-chat}]]
+    (rf/dispatch [:profile/check-profile-update-prompt main-event])))
+
 (defn- banner-data
   [profile-link]
   {:title-props
    {:beta?               true
     :label               (i18n/label :t/messages)
-    :handler             #(rf/dispatch
-                           [:show-bottom-sheet {:content chat.actions.view/new-chat}])
+    :handler             on-new-message-press
     :accessibility-label :new-chat-button}
    :card-props
    {:on-press    #(rf/dispatch [:open-share {:options {:url profile-link}}])

src/status_im/contexts/chat/messenger/messages/drawers/view.cljs

@@ -95,10 +95,10 @@
 
 (defn get-actions
   [{:keys [outgoing content pinned-by outgoing-status deleted? deleted-for-me? content-type
-           bridge-message]
+           bridge-message message-id]
     :as   message-data}
    {:keys [able-to-send-message? community? community-member? can-delete-message-for-everyone?
-           message-pin-enabled group-chat group-admin?]}]
+           message-pin-enabled group-chat group-admin? debug-log-level?]}]
   (let [edit-message?        (and (or community-member? (not community?))
                                   outgoing
                                   (not (or deleted? deleted-for-me?))
@@ -153,6 +153,14 @@
              :icon                :i/copy
              :id                  :copy})
 
+      debug-log-level?
+      (conj {:type                :main
+             :on-press            #(clipboard/set-string message-id)
+             :label               (i18n/label :t/copy-message-id)
+             :accessibility-label :copy-message-id
+             :icon                :i/copy
+             :id                  :copy-message-id})
+
       pin-message?
       (conj {:type                :main
              :on-press            #(pin-message message-data)

src/status_im/contexts/keycard/backup/events.cljs

@@ -0,0 +1,137 @@
+(ns status-im.contexts.keycard.backup.events
+  (:require [utils.re-frame :as rf]
+            [utils.security.core :as security]))
+
+(rf/reg-event-fx :keycard/backup.generate-and-load-key
+ (fn [{:keys [db]}]
+   (let [{:keys [masked-phrase pin]} (get-in db [:keycard :backup])]
+     {:fx [[:effects.keycard/generate-and-load-key
+            {:mnemonic   (security/safe-unmask-data masked-phrase)
+             :pin        pin
+             :on-success (fn []
+                           (rf/dispatch [:keycard/disconnect])
+                           (rf/dispatch [:navigate-back])
+                           (rf/dispatch [:open-modal :screen/keycard.backup.success]))
+             :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error %])}]]})))
+
+(defn- ready-to-add-not-empty
+  [error]
+  (rf/dispatch [:navigate-back])
+  (if (= error :keycard/error.not-keycard)
+    (rf/dispatch [:keycard/on-application-info-error error])
+    (do
+      (rf/dispatch [:keycard/disconnect])
+      (rf/dispatch [:open-modal :screen/keycard.backup.not-empty
+                    {:on-press #(rf/dispatch [:keycard/backup.ready-to-add-connect])}]))))
+
+(rf/reg-event-fx :keycard/backup.ready-to-add-connect
+ (fn [_]
+   {:fx [[:dispatch
+          [:keycard/connect
+           {:theme :dark
+            :on-error
+            (fn [error]
+              (if (= error :keycard/error.keycard-empty)
+                (rf/dispatch [:keycard/backup.generate-and-load-key])
+                (ready-to-add-not-empty error)))}]]]}))
+
+(defn- scan-empty-card-not-empty
+  [error]
+  (rf/dispatch [:navigate-back])
+  (if (= error :keycard/error.not-keycard)
+    (rf/dispatch [:keycard/on-application-info-error error])
+    (do
+      (rf/dispatch [:keycard/disconnect])
+      (rf/dispatch [:open-modal :screen/keycard.backup.not-empty
+                    {:on-press #(rf/dispatch [:keycard/backup.scan-empty-card])}]))))
+
+(rf/reg-event-fx :keycard/backup.scan-empty-card
+ (fn [_]
+   {:fx [[:dispatch
+          [:keycard/connect
+           {:theme :dark
+            :on-error
+            (fn [error]
+              (if (= error :keycard/error.keycard-empty)
+                (do
+                  (rf/dispatch [:keycard/disconnect])
+                  (rf/dispatch [:keycard/backup.create-or-enter-pin]))
+                (scan-empty-card-not-empty error)))}]]]}))
+
+(rf/reg-event-fx :keycard/backup.save-pin
+ (fn [{:keys [db]} [pin]]
+   {:db (assoc-in db [:keycard :backup :pin] pin)}))
+
+(defn- save-pin-and-navigate-to-phrase
+  [pin]
+  (rf/dispatch [:keycard/disconnect])
+  (rf/dispatch [:navigate-back])
+  (rf/dispatch [:keycard/backup.save-pin pin])
+  (rf/dispatch
+   [:open-modal :screen/use-recovery-phrase-dark
+    {:on-success #(rf/dispatch [:keycard/backup.phrase-entered %])}]))
+
+(defn- verify-entered-pin-and-continue
+  [pin]
+  (rf/dispatch
+   [:keycard/connect
+    {:theme :dark
+     :on-error
+     (fn [error]
+       (if (= error :keycard/error.keycard-empty)
+         (rf/dispatch
+          [:keycard/verify-pin
+           {:pin        pin
+            :on-success #(save-pin-and-navigate-to-phrase pin)
+            :on-failure #(rf/dispatch [:keycard/on-action-with-pin-error %])}])
+         (rf/dispatch [:keycard/on-application-info-error error])))}]))
+
+(declare init-card-not-empty)
+
+(defn- init-card-with-pin-and-continue
+  [pin]
+  (rf/dispatch
+   [:keycard/connect
+    {:theme :dark
+     :on-error
+     (fn [error]
+       (if (= error :keycard/error.keycard-empty)
+         (rf/dispatch
+          [:keycard/init-card
+           {:pin        pin
+            :on-success #(rf/dispatch
+                          [:keycard/get-application-info
+                           {:on-error
+                            (fn [error]
+                              (if (= error :keycard/error.keycard-empty)
+                                (save-pin-and-navigate-to-phrase pin)
+                                (init-card-not-empty pin error)))}])}])
+         (init-card-not-empty pin error)))}]))
+
+(defn- init-card-not-empty
+  [pin error]
+  (rf/dispatch [:navigate-back])
+  (if (= error :keycard/error.not-keycard)
+    (rf/dispatch [:keycard/on-application-info-error error])
+    (do
+      (rf/dispatch [:keycard/disconnect])
+      (rf/dispatch [:open-modal :screen/keycard.backup.not-empty
+                    {:on-press #(init-card-with-pin-and-continue pin)}]))))
+
+(rf/reg-event-fx :keycard/backup.create-or-enter-pin
+ (fn [{:keys [db]}]
+   (let [{:keys [initialized?]} (get-in db [:keycard :application-info])]
+     {:fx [[:dispatch [:navigate-back]]
+           (if initialized?
+             [:dispatch
+              [:open-modal :screen/keycard.pin.enter
+               {:on-complete verify-entered-pin-and-continue}]]
+             [:dispatch
+              [:open-modal :screen/keycard.pin.create
+               {:on-complete init-card-with-pin-and-continue}]])]})))
+
+(rf/reg-event-fx :keycard/backup.phrase-entered
+ (fn [{:keys [db]} [{:keys [phrase]}]]
+   {:db (assoc-in db [:keycard :backup :masked-phrase] phrase)
+    :fx [[:dispatch [:navigate-back]]
+         [:dispatch [:open-modal :screen/keycard.backup.ready-to-add]]]}))

src/status_im/contexts/keycard/backup/view.cljs

@@ -0,0 +1,96 @@
+(ns status-im.contexts.keycard.backup.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.events-helper :as events-helper]
+            [status-im.common.resources :as resources]
+            [status-im.contexts.keycard.common.view :as common.view]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn ready-to-add
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title (i18n/label :t/ready-add-keypair-keycard)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain
+      :source      (resources/get-image :keycard-migration)}]]
+   [common.view/tips]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/scan-keycard)
+     :button-one-props {:on-press #(rf/dispatch [:keycard/backup.ready-to-add-connect])}}]])
+
+(defn success-view
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title (i18n/label :t/backup-keycard-created)}]
+   [rn/view {:style {:flex 1}}]
+   [rn/view {:style {:padding-horizontal 20}}
+    [quo/button {:on-press events-helper/navigate-back}
+     (i18n/label :t/done)]]])
+
+(defn not-empty-view
+  []
+  (let [{:keys [on-press]} (rf/sub [:get-screen-params])]
+    [:<>
+     [quo/page-nav
+      {:icon-name :i/close
+       :on-press  events-helper/navigate-back}]
+     [quo/page-top
+      {:title            (i18n/label :t/keycard-not-empty)
+       :description      :text
+       :description-text (i18n/label :t/scan-empty-keycard)}]
+     [rn/view {:style {:flex 1}}]
+     [common.view/tips]
+     [rn/view {:style {:padding-horizontal 20}}
+      [quo/button {:on-press on-press}
+       (i18n/label :t/try-again)]]]))
+
+(defn scan-empty
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title            (i18n/label :t/scan-empty-keycard)
+     :description      :text
+     :description-text (i18n/label :t/backup-empty-keycard-only)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain
+      :source      (resources/get-image :check-your-keycard)}]]
+   [common.view/tips]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/ready-to-scan)
+     :button-one-props {:on-press #(rf/dispatch [:keycard/backup.scan-empty-card])}}]])
+
+(defn sheet
+  [{:keys [on-continue]}]
+  (let [customization-color (rf/sub [:profile/customization-color])]
+    [:<>
+     [quo/drawer-top {:title (i18n/label :t/create-backup-keycard)}]
+     [quo/text
+      {:style {:padding-horizontal 20
+               :padding-vertical   8}}
+      (i18n/label :t/backup-keycard-instructions)]
+     [quo/bottom-actions
+      {:actions          :two-actions
+       :button-one-label (i18n/label :t/continue)
+       :button-one-props {:customization-color customization-color
+                          :on-press            (fn []
+                                                 (rf/dispatch [:hide-bottom-sheet])
+                                                 (on-continue))}
+       :button-two-label (i18n/label :t/cancel)
+       :button-two-props {:type     :grey
+                          :on-press #(rf/dispatch [:hide-bottom-sheet])}}]]))

src/status_im/contexts/keycard/change_pin/events.cljs

@@ -0,0 +1,73 @@
+(ns status-im.contexts.keycard.change-pin.events
+  (:require [status-im.contexts.keycard.utils :as utils]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]
+            [utils.security.core :as security]))
+
+(rf/reg-event-fx :keycard/change-pin.enter-current-pin
+ (fn [{:keys [db]}]
+   {:db (update db :keycard dissoc :change-pin)
+    :fx [[:dispatch [:navigate-back]]
+         [:dispatch
+          [:open-modal :screen/keycard.pin.enter
+           {:title       (i18n/label :t/enter-current-keycard-pin)
+            :on-complete (fn [current-pin]
+                           (rf/dispatch [:navigate-back])
+                           (rf/dispatch [:keycard/change-pin.save-current-pin current-pin])
+                           (rf/dispatch [:keycard/change-pin.enter-new-pin]))}]]]}))
+
+(rf/reg-event-fx :keycard/change-pin.save-current-pin
+ (fn [{:keys [db]} [pin]]
+   {:db (assoc-in db [:keycard :change-pin :current-pin] (security/mask-data pin))}))
+
+(rf/reg-event-fx :keycard/change-pin.enter-new-pin
+ (fn [_]
+   {:fx [[:dispatch
+          [:open-modal :screen/keycard.pin.create
+           {:title              (i18n/label :t/create-new-keycard-pin)
+            :repeat-stage-title (i18n/label :t/repeat-new-keycard-pin)
+            :on-complete        (fn [new-pin]
+                                  (rf/dispatch [:navigate-back])
+                                  (rf/dispatch [:keycard/change-pin.save-new-pin new-pin])
+                                  (rf/dispatch [:open-modal :screen/keycard.ready-to-change-pin]))}]]]}))
+
+(rf/reg-event-fx :keycard/change-pin.save-new-pin
+ (fn [{:keys [db]} [pin]]
+   {:db (assoc-in db [:keycard :change-pin :new-pin] (security/mask-data pin))}))
+
+(defn- change-pin-and-continue
+  [current-pin new-pin]
+  (rf/dispatch [:keycard/change-pin
+                {:on-success  (fn []
+                                (rf/dispatch [:navigate-back])
+                                (rf/dispatch [:keycard/disconnect])
+                                (rf/dispatch [:open-modal :screen/keycard.pin-change-success]))
+                 :on-failure  (fn []
+                                (rf/dispatch [:navigate-back])
+                                (rf/dispatch [:keycard/disconnect])
+                                (rf/dispatch [:open-modal :screen/keycard.pin-change-failed]))
+                 :current-pin current-pin
+                 :new-pin     new-pin}]))
+
+(defn- verify-pin-and-continue
+  [current-pin new-pin]
+  (rf/dispatch
+   [:keycard/verify-pin
+    {:pin        current-pin
+     :on-success #(change-pin-and-continue current-pin new-pin)
+     :on-failure (fn [error]
+                   (when-not (utils/tag-lost? (:error error))
+                     (rf/dispatch [:keycard/disconnect])
+                     (rf/dispatch [:keycard/on-action-with-pin-error error])
+                     (rf/dispatch [:keycard/change-pin.enter-current-pin])))}]))
+
+(rf/reg-event-fx :keycard/change-pin.verify-current-pin-and-continue
+ (fn [{:keys [db]}]
+   (let [{:keys [current-pin new-pin]} (get-in db [:keycard :change-pin])
+         unmasked-current-pin          (security/safe-unmask-data current-pin)
+         unmasked-new-pin              (security/safe-unmask-data new-pin)]
+     {:fx [[:dispatch
+            [:keycard/connect
+             {:theme      :dark
+              :key-uid    (get-in db [:profile/profile :key-uid])
+              :on-success #(verify-pin-and-continue unmasked-current-pin unmasked-new-pin)}]]]})))

src/status_im/contexts/keycard/change_pin/view.cljs

@@ -0,0 +1,82 @@
+(ns status-im.contexts.keycard.change-pin.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.common.events-helper :as events-helper]
+            [status-im.contexts.keycard.common.view :as common.view]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn change-pin-confirmation-sheet
+  []
+  [quo/documentation-drawers
+   {:title  (i18n/label :t/change-pin-keycard)
+    :shell? true}
+   [rn/view
+    [quo/text {:size :paragraph-2}
+     (i18n/label :t/change-pin-keycard-message)]
+    [quo/bottom-actions
+     {:actions          :two-actions
+      :container-style  {:margin-horizontal -20}
+      :blur?            true
+      :button-one-label (i18n/label :t/continue)
+      :button-one-props {:on-press #(rf/dispatch [:keycard/change-pin.enter-current-pin])}
+      :button-two-label (i18n/label :t/cancel)
+      :button-two-props {:on-press events-helper/hide-bottom-sheet
+                         :type     :grey}}]]])
+
+(defn ready-to-change-pin
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title (i18n/label :t/ready-to-change-pin)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain}]]
+   [common.view/tips]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/scan-keycard)
+     :button-one-props {:on-press #(rf/dispatch
+                                    [:keycard/change-pin.verify-current-pin-and-continue])}}]])
+
+(defn pin-change-success
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title            (i18n/label :t/keycard-pin-changed)
+     :description      :text
+     :description-text (i18n/label :t/keycard-pin-changed-description)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain}]]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/done)
+     :button-one-props {:on-press events-helper/navigate-back}}]])
+
+(defn pin-change-failed
+  []
+  [:<>
+   [quo/page-nav
+    {:icon-name :i/close
+     :on-press  events-helper/navigate-back}]
+   [quo/page-top
+    {:title            (i18n/label :t/keycard-pin-change-failed)
+     :description      :text
+     :description-text (i18n/label :t/keycard-pin-change-failed-description)}]
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+    [rn/image
+     {:resize-mode :contain}]]
+   [common.view/tips]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :button-one-label (i18n/label :t/try-again)
+     :button-one-props {:on-press (fn []
+                                    (rf/dispatch [:navigate-back])
+                                    (rf/dispatch [:open-modal :screen/keycard.ready-to-change-pin]))}}]])

src/status_im/contexts/keycard/check/events.cljs

@@ -0,0 +1,26 @@
+(ns status-im.contexts.keycard.check.events
+  (:require [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :keycard/check-empty-card
+ (fn [{:keys [db]}]
+   (let [keycard-profile? (not (nil? (get-in db [:profile/profile :keycard-pairing])))]
+     {:fx [[:dispatch
+            [:keycard/connect
+             {:key-uid (get-in db [:profile/profile :key-uid])
+              :theme :dark
+              :on-success
+              (fn []
+                (rf/dispatch [:keycard/disconnect])
+                (rf/dispatch [:navigate-back])
+                (if keycard-profile?
+                  (rf/dispatch [:open-modal :screen/keycard.manage.profile-keys])
+                  (rf/dispatch [:open-modal :screen/keycard.migrate.profile-keys])))
+              :on-error
+              (fn [error]
+                (rf/dispatch [:navigate-back])
+                (if (and (= error :keycard/error.keycard-empty)
+                         (not keycard-profile?))
+                  (do
+                    (rf/dispatch [:keycard/disconnect])
+                    (rf/dispatch [:open-modal :screen/keycard.empty]))
+                  (rf/dispatch [:keycard/on-application-info-error error])))}]]]})))

src/status_im/contexts/keycard/check/view.cljs

@@ -4,6 +4,7 @@
             [status-im.common.events-helper :as events-helper]
             [status-im.common.resources :as resources]
             [status-im.constants :as constants]
+            [status-im.contexts.keycard.common.view :as common.view]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
@@ -35,6 +36,7 @@
        :right-side [{:icon-name :i/info
                      :on-press  #(rf/dispatch [:show-bottom-sheet
                                                {:content keycard-documentation
+                                                :theme   :dark
                                                 :shell?  true}])}]}]
      [quo/page-top
       {:title            (i18n/label :t/check-keycard)
@@ -44,9 +46,7 @@
       [rn/image
        {:resize-mode :contain
         :source      (resources/get-image :check-your-keycard)}]]
-     [quo/divider-label (i18n/label :t/tips-scan-keycard)]
-     [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
-     [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]
+     [common.view/tips]
      [quo/bottom-actions
       {:actions          :one-action
        :button-one-label (i18n/label :t/ready-to-scan)

src/status_im/contexts/keycard/common/view.cljs

@@ -0,0 +1,10 @@
+(ns status-im.contexts.keycard.common.view
+  (:require [quo.core :as quo]
+            [utils.i18n :as i18n]))
+
+(defn tips
+  []
+  [:<>
+   [quo/divider-label (i18n/label :t/tips-scan-keycard)]
+   [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
+   [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]])

src/status_im/contexts/keycard/create/events.cljs

@@ -1,5 +1,7 @@
 (ns status-im.contexts.keycard.create.events
   (:require [clojure.string :as string]
+            [status-im.common.resources :as resources]
+            [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [utils.security.core :as security]))
 
@@ -7,9 +9,10 @@
  (fn [_]
    {:fx [[:dispatch
           [:keycard/connect
-           {:on-error
+           {:theme :dark
+            :on-error
             (fn [error]
-              (if (= error :keycard/error.keycard-blank)
+              (if (= error :keycard/error.keycard-empty)
                 (do
                   (rf/dispatch [:keycard/disconnect])
                   (rf/dispatch [:open-modal :screen/keycard.empty-create]))
@@ -18,8 +21,17 @@
 (defn- backup-recovery-phrase-success
   [masked-seed-phrase]
   (rf/dispatch [:navigate-back])
-  (rf/dispatch [:open-modal :screen/confirm-backup
+  (rf/dispatch [:open-modal :screen/confirm-backup-dark
                 {:masked-seed-phrase masked-seed-phrase
+                 :theme              :dark
+                 :shell?             true
+                 :on-try-again       #(rf/dispatch [:open-modal :screen/backup-recovery-phrase-dark
+                                                    {:on-success         backup-recovery-phrase-success
+                                                     :masked-seed-phrase (->> masked-seed-phrase
+                                                                              security/safe-unmask-data
+                                                                              (string/join " ")
+                                                                              security/mask-data)
+                                                     :revealed?          true}])
                  :on-success         #(rf/dispatch [:keycard/create.phrase-backed-up
                                                     masked-seed-phrase])}]))
 
@@ -39,10 +51,13 @@
               security/safe-unmask-data
               (string/join " ")
               security/mask-data))
-    :fx [[:dispatch [:keycard/create.create-or-enter-pin]]]}))
+    :fx [[:dispatch
+          [:keycard/create.create-or-enter-pin
+           {:ready-to-add-screen-title (i18n/label :t/ready-add-keypair-keycard)
+            :ready-to-add-screen-image (resources/get-image :add-key-to-keycard)}]]]}))
 
 (rf/reg-event-fx :keycard/create.create-or-enter-pin
- (fn [{:keys [db]}]
+ (fn [{:keys [db]} [{:keys [ready-to-add-screen-title ready-to-add-screen-image]}]]
    (let [{:keys [initialized?]} (get-in db [:keycard :application-info])]
      {:fx [[:dispatch [:navigate-back]]
            (if initialized?
@@ -56,7 +71,9 @@
                {:on-complete (fn [new-pin]
                                (rf/dispatch [:navigate-back])
                                (rf/dispatch [:keycard/create.save-pin new-pin])
-                               (rf/dispatch [:open-modal :screen/keycard.create.ready-to-add]))}]])]})))
+                               (rf/dispatch [:open-modal :screen/keycard.create.ready-to-add
+                                             {:title ready-to-add-screen-title
+                                              :image ready-to-add-screen-image}]))}]])]})))
 
 (rf/reg-event-fx :keycard/create.save-pin
  (fn [{:keys [db]} [pin]]
@@ -64,7 +81,7 @@
 
 (rf/reg-event-fx :keycard/create.on-application-info-error
  (fn [{:keys [db]} [error]]
-   (if (or (= error :keycard/error.keycard-blank)
+   (if (or (= error :keycard/error.keycard-empty)
            (and (get-in db [:keycard :application-info :initialized?])
                 (= error :keycard/error.keycard-wrong-profile)))
      (rf/dispatch [:keycard/create.continue])
@@ -74,7 +91,8 @@
  (fn [_]
    {:fx [[:dispatch
           [:keycard/connect
-           {:on-error #(rf/dispatch [:keycard/create.on-application-info-error %])}]]]}))
+           {:theme    :dark
+            :on-error #(rf/dispatch [:keycard/create.on-application-info-error %])}]]]}))
 
 (defn get-application-info-and-continue
   []
@@ -90,7 +108,7 @@
      (cond
 
        (not initialized?)
-       {:fx [[:keycard/init-card
+       {:fx [[:effects.keycard/init-card
               {:pin        pin
                :on-success get-application-info-and-continue}]]}
 
@@ -112,4 +130,7 @@
    (if (contains? (:profile/profiles-overview db) key-uid)
      {:fx [[:dispatch [:onboarding/multiaccount-already-exists key-uid]]]}
      {:db (assoc-in db [:keycard :create :masked-phrase] masked-seed-phrase)
-      :fx [[:dispatch [:keycard/create.create-or-enter-pin]]]})))
+      :fx [[:dispatch
+            [:keycard/create.create-or-enter-pin
+             {:ready-to-add-screen-title (i18n/label :t/ready-to-import-keypair-keycard)
+              :ready-to-add-screen-image (resources/get-image :import-key-to-keycard)}]]]})))

src/status_im/contexts/keycard/create/view.cljs

@@ -2,10 +2,9 @@
   (:require [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.events-helper :as events-helper]
-            [status-im.common.not-implemented :as not-implemented]
             [status-im.common.resources :as resources]
-            [status-im.config :as config]
             [status-im.constants :as constants]
+            [status-im.contexts.keycard.common.view :as common.view]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
@@ -25,6 +24,7 @@
       :title               (i18n/label :t/check-keycard)
       :subtitle            (i18n/label :t/see-keycard-ready)
       :button-label        (i18n/label :t/scan-keycard)
+      :button-props        {:type :primary :icon-left :i/keycard}
       :accessibility-label :get-keycard
       :image               (resources/get-image :check-your-keycard)
       :on-press            #(rf/dispatch [:keycard/create.check-empty-card])}]
@@ -37,31 +37,35 @@
       :image               (resources/get-image :use-keycard)
       :on-press            #(rf/dispatch [:browser.ui/open-url constants/get-keycard-url])}]]
    [rn/view {:style {:flex 1}}]
-   [quo/divider-label (i18n/label :t/tips-scan-keycard)]
-   [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
-   [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]])
+   [common.view/tips]])
+
+(defn- ready-to-add-documentation
+  []
+  [quo/documentation-drawers
+   {:shell? true}
+   [quo/text {:size :paragraph-2}
+    (i18n/label :t/ready-add-keypair-keycard-documentation)]])
 
 (defn ready-to-add
   []
-  [:<>
-   [quo/page-nav
-    {:icon-name  :i/close
-     :on-press   events-helper/navigate-back
-     :right-side [(when config/show-not-implemented-features?
-                    {:icon-name :i/info
-                     :on-press  not-implemented/alert})]}]
-   [quo/page-top
-    {:title            (i18n/label :t/ready-add-keypair-keycard)
-     :description      :text
-     :description-text ""}]
-   [rn/image
-    {:resize-mode :contain
-     :style       {:flex 1 :align-self :center :margin-vertical 37}
-     :source      (resources/get-image :add-key-to-keycard)}]
-   [quo/divider-label (i18n/label :t/tips-scan-keycard)]
-   [quo/markdown-list {:description (i18n/label :t/remove-phone-case)}]
-   [quo/markdown-list {:description (i18n/label :t/keep-card-steady)}]
-   [quo/bottom-actions
-    {:actions          :one-action
-     :button-one-label (i18n/label :t/scan-keycard)
-     :button-one-props {:on-press #(rf/dispatch [:keycard/create.start])}}]])
+  (let [{:keys [title image]} (rf/sub [:get-screen-params])]
+    [:<>
+     [quo/page-nav
+      {:icon-name  :i/close
+       :on-press   events-helper/navigate-back
+       :right-side [{:icon-name :i/info
+                     :on-press  #(rf/dispatch [:show-bottom-sheet
+                                               {:content ready-to-add-documentation
+                                                :theme   :dark
+                                                :shell?  true}])}]}]
+     [quo/page-top
+      {:title title}]
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :align-self :center :margin-vertical 37}
+       :source      image}]
+     [common.view/tips]
+     [quo/bottom-actions
+      {:actions          :one-action
+       :button-one-label (i18n/label :t/scan-keycard)
+       :button-one-props {:on-press #(rf/dispatch [:keycard/create.start])}}]]))

src/status_im/contexts/keycard/effects.cljs

@@ -56,6 +56,14 @@
  (fn [args]
    (keycard/factory-reset (keycard.utils/wrap-handlers args))))
 
+(rf/reg-fx :effects.keycard/verify-pin
+ (fn [args]
+   (keycard/verify-pin (keycard.utils/wrap-handlers args))))
+
+(rf/reg-fx :effects.keycard/change-pin
+ (fn [args]
+   (keycard/change-pin (keycard.utils/wrap-handlers args))))
+
 (rf/reg-fx :effects.keycard/sign
  (fn [args]
    (-> (keycard/sign args)
@@ -75,7 +83,7 @@
        (promesa/then on-success)
        (promesa/catch (keycard.utils/get-on-failure args)))))
 
-(rf/reg-fx :keycard/init-card
+(rf/reg-fx :effects.keycard/init-card
  (fn [args]
    (keycard/init-card (keycard.utils/wrap-handlers args))))
 

src/status_im/contexts/keycard/empty/view.cljs

@@ -25,7 +25,7 @@
      :accessibility-label :create-new-profile-keycard
      :container-style     {:margin-horizontal 20 :margin-top 8}
      :image               (resources/get-image :keycard-buy)
-     :button-type         :primary
+     :button-props        {:type :primary}
      :on-press            #(rf/dispatch [:keycard/create.get-phrase])}]
    [quo/small-option-card
     {:variant             :icon

src/status_im/contexts/keycard/error/view.cljs

@@ -2,20 +2,22 @@
   (:require [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.events-helper :as events-helper]
+            [status-im.contexts.keycard.backup.view :as backup.view]
             [status-im.contexts.keycard.factory-reset.view :as factory-reset]
+            [status-im.contexts.keycard.unblock.view :as keycard.unblock]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
 (def titles
-  {:keycard/error.keycard-blank         {:title       (i18n/label :t/keycard-empty)
+  {:keycard/error.keycard-empty         {:title       (i18n/label :t/keycard-empty)
                                          :description (i18n/label :t/no-key-pair-keycard)}
    :keycard/error.keycard-wrong-profile {:title       (i18n/label :t/keycard-not-empty)
                                          :description (i18n/label :t/cant-store-new-keys)}
    :keycard/error.keycard-unpaired      {:title       (i18n/label :t/keycard-full)
                                          :description (i18n/label :t/pairing-slots-occupied)}
-   :keycard/error.keycard-frozen        {:title       (i18n/label :t/keycard-locked)
+   :keycard/error.keycard-frozen        {:title       (i18n/label :t/keycard-blocked)
                                          :description (i18n/label :t/cant-use-right-now)}
-   :keycard/error.keycard-locked        {:title       (i18n/label :t/keycard-locked)
+   :keycard/error.keycard-locked        {:title       (i18n/label :t/keycard-blocked)
                                          :description (i18n/label :t/cant-use-right-now)}})
 
 (defn view
@@ -31,11 +33,38 @@
        :description      :text
        :description-text description}]
      [rn/view {:style {:margin-horizontal 20}}
-      [quo/keycard {:holder-name ""}]
-      (when (not= :keycard/error.keycard-blank error)
+      [quo/keycard {:blur? true}]
+      [quo/section-label
+       {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
+      (if (= error :keycard/error.keycard-empty)
+        [quo/settings-item
+         {:title             (i18n/label :t/use-backup-keycard)
+          :image             :icon
+          :image-props       :i/placeholder
+          :action            :arrow
+          :description       :text
+          :description-props {:text (i18n/label :t/create-backup-profile-keycard)}
+          :on-press          (fn []
+                               (rf/dispatch [:show-bottom-sheet
+                                             {:content
+                                              (fn []
+                                                [backup.view/sheet
+                                                 {:on-continue
+                                                  (rf/dispatch
+                                                   [:keycard/backup.create-or-enter-pin])}])}]))}]
         [:<>
-         [quo/section-label
-          {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
+         (when (or (= error :keycard/error.keycard-frozen)
+                   (= error :keycard/error.keycard-locked))
+           [quo/settings-item
+            {:title             (i18n/label :t/unblock-keycard)
+             :image             :icon
+             :image-props       :i/placeholder
+             :action            :arrow
+             :description       :text
+             :description-props {:text (i18n/label :t/with-recovery-phrase)}
+             :on-press          (fn []
+                                  (rf/dispatch [:show-bottom-sheet
+                                                {:content keycard.unblock/sheet}]))}])
          [quo/settings-item
           {:title             (i18n/label :t/factory-reset)
            :image             :icon
@@ -45,4 +74,6 @@
            :description-props {:text (i18n/label :t/remove-keycard-content)}
            :on-press          (fn []
                                 (rf/dispatch [:show-bottom-sheet
-                                              {:content factory-reset/sheet}]))}]])]]))
+                                              {:theme   :dark
+                                               :shell?  true
+                                               :content factory-reset/sheet}]))}]])]]))

src/status_im/contexts/keycard/events.cljs

@@ -1,5 +1,7 @@
 (ns status-im.contexts.keycard.events
   (:require [re-frame.core :as rf]
+            status-im.contexts.keycard.backup.events
+            status-im.contexts.keycard.check.events
             status-im.contexts.keycard.create.events
             status-im.contexts.keycard.login.events
             status-im.contexts.keycard.migrate.events
@@ -8,6 +10,7 @@
             status-im.contexts.keycard.nfc.sheets.events
             status-im.contexts.keycard.pin.events
             status-im.contexts.keycard.sign.events
+            status-im.contexts.keycard.unblock.events
             [status-im.contexts.keycard.utils :as keycard.utils]
             [utils.address :as address]
             utils.datetime
@@ -56,6 +59,10 @@
                 [:keycard/on-application-info-error
                  :keycard/error.keycard-locked]])]}))))
 
+(rf/reg-event-fx :keycard/init-card
+ (fn [_ [data]]
+   {:effects.keycard/init-card data}))
+
 (rf/reg-event-fx :keycard/get-keys
  (fn [_ [data]]
    {:effects.keycard/get-keys data}))
@@ -72,11 +79,20 @@
  (fn [_ [data]]
    {:effects.keycard/factory-reset data}))
 
+(rf/reg-event-fx :keycard/verify-pin
+ (fn [_ [data]]
+   {:effects.keycard/verify-pin data}))
+
+(rf/reg-event-fx :keycard/change-pin
+ (fn [_ [data]]
+   {:effects.keycard/change-pin data}))
+
 (rf/reg-event-fx :keycard/connect-derive-address-and-add-account
  (fn [_ [{:keys [pin derivation-path key-uid account-preferences]}]]
    {:fx [[:dispatch
           [:keycard/connect
-           {:key-uid key-uid
+           {:theme :dark
+            :key-uid key-uid
             :on-success
             (fn []
               (rf/dispatch
@@ -145,17 +161,26 @@
                        (rf/dispatch [:keycard/on-application-info-error
                                      :keycard/error.not-keycard]))))}}))
 
+(rf/reg-event-fx :keycard/connect.next-stage
+ (fn [{:keys [db]} [{:keys [key-uid on-success on-error]}]]
+   (let [event-vector [:keycard/get-application-info
+                       {:key-uid    key-uid
+                        :on-success on-success
+                        :on-error   on-error}]]
+     {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
+      :fx [(when (get-in db [:keycard :card-connected?])
+             [:dispatch event-vector])]})))
+
 (rf/reg-event-fx :keycard/connect
- (fn [{:keys [db]} [{:keys [key-uid on-success on-error on-connect-event-vector]}]]
-   (let [event-vector
-         (or on-connect-event-vector
-             [:keycard/get-application-info
-              {:key-uid    key-uid
-               :on-success on-success
-               :on-error   on-error}])]
+ (fn [{:keys [db]} [{:keys [key-uid on-success on-error theme]}]]
+   (let [event-vector [:keycard/get-application-info
+                       {:key-uid    key-uid
+                        :on-success on-success
+                        :on-error   on-error}]]
      {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
       :fx [[:dispatch
             [:keycard/show-connection-sheet
-             {:on-cancel-event-vector [:keycard/cancel-connection]}]]
+             {:on-cancel-event-vector [:keycard/cancel-connection]
+              :theme                  theme}]]
            (when (get-in db [:keycard :card-connected?])
              [:dispatch event-vector])]})))