lint

updates
2023-04-26 13:38:53 +04:00 · 2023-04-26 13:29:57 +04:00 · 2023-04-26 13:29:57 +04:00 · 2023-04-26 13:29:57 +04:00 · 2023-04-26 13:29:56 +04:00 · 2023-04-26 13:29:56 +04:00
1601 changed files with 17048 additions and 13617 deletions
@@ -12,11 +12,11 @@ status-im.chat.models.message-content/actions
 status-im.chat.models.message-content/blank-string
 status-im.chat.models.message-content/sorted-ranges
 status-im.ethereum.mnemonic/words->passphrase
-native-module.core/listener
-native-module.core/multiaccount-reset
-native-module.core/extract-group-membership-signatures
-native-module.core/sign-group-membership
-native-module.core/update-mailservers
+status-im.native-module.core/listener
+status-im.native-module.core/multiaccount-reset
+status-im.native-module.core/extract-group-membership-signatures
+status-im.native-module.core/sign-group-membership
+status-im.native-module.core/update-mailservers
 status-im.ethereum.abi-spec/bytes-to-hex
 status-im.android.core/init
 status-im.chat.models.message/transport-keys
@@ -5,6 +5,7 @@ project-board:
  min-reviewers: 1
  tested-pr-label-name: 'Tested - Issues'
  contributor-column-name: 'CONTRIBUTOR'
+  to-rebase-column-name: 'TO REBASE'
  review-column-name: 'REVIEW'
  test-column-name: 'E2E Tests'

@@ -218,18 +218,23 @@ release-android: keystore build-android ##@build Build signed Android APK

 release-ios: export TARGET := ios
 release-ios: export BUILD_ENV ?= prod
-release-ios: watchman-clean ios-clean jsbundle ##@build Build release for iOS release
-	xcodebuild \
-		-scheme StatusIm \
-		-configuration Release \
-		-workspace ios/StatusIm.xcworkspace \
-		-destination 'generic/platform=iOS' \
-		-UseModernBuildSystem=N clean archive
+release-ios: watchman-clean ##@build Build release for iOS release
+	@git clean -dxf -f target/ios && \
+	$(MAKE) jsbundle-ios && \
+	xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive

-jsbundle: SHELL := /bin/sh
-jsbundle: export BUILD_ENV ?= prod
-jsbundle: ##@build Build JavaScript and Clojurescript bundle for iOS and Android
-	nix/scripts/build.sh targets.mobile.jsbundle
+jsbundle-android: SHELL := /bin/sh
+jsbundle-android: export TARGET := android
+jsbundle-android: export BUILD_ENV ?= prod
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojurescript into app directory
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the.js files to the project root
+	nix/scripts/build.sh targets.mobile.android.jsbundle && \
+	mv result/*.js ./
+
+jsbundle-ios: export TARGET := ios
+jsbundle-ios: export BUILD_ENV ?= prod
+jsbundle-ios: ##@jsbundle Compile JavaScript and Clojure into index.ios.js
+	yarn shadow-cljs release mobile

 #--------------
 # status-go lib
@@ -360,7 +365,6 @@ component-test: ##@test Run component tests once in NodeJS
 	yarn shadow-cljs compile component-test && \
 	jest --config=test/jest/jest.config.js

-#--------------
 # Other
 #--------------

@@ -369,10 +373,6 @@ geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545

-ios-clean: SHELL := /bin/sh
-ios-clean: ##@prepare Clean iOS build artifacts
-	git clean -dxf -f target/ios
-
 android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
 	git clean -dxf -f ./android/app/build; \
@@ -1 +1 @@
-1.23.0
+1.22.0
@@ -72,7 +72,7 @@ public class MainApplication extends NavigationApplication {
        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());

        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
-        //initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    }
    /**
     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -40,12 +40,16 @@ pipeline {
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
+    /* coverage report identification */
+    COVERALLS_SERVICE_NAME = "jenkins"
+    COVERALLS_SERVICE_JOB_ID = "${JOB_NAME}#${BUILD_NUMBER}"
  }

  stages {
    stage('Prep') {
      steps {
        script {
+          utils.doGitRebasePR()
          utils.symlinkEnv()
          println("Build Number: ${utils.genBuildNumber()}")
        }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -48,6 +48,7 @@ pipeline {
    stage('Prep') {
      steps {
        script {
+          utils.doGitRebasePR()
          utils.symlinkEnv()
          println("Build Number: ${utils.genBuildNumber()}")
        }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -61,9 +61,10 @@ pipeline {
    }
    stage('Build android jsbundle') {
      steps { script {
-        /* Build/fetch deps required for jsbundle build. */
+        /* build/fetch things required to produce a js-bundle for android
+         * (e.g. maven and node repos) */
        nix.build(
-          attr: 'targets.mobile.jsbundle',
+          attr: 'targets.mobile.android.jsbundle',
          sandbox: false,
          pure: false,
          link: false
@@ -72,7 +73,7 @@ pipeline {
    }
    stage('Build android deps') {
      steps { script {
-        /* Build/fetch deps required to build android release. */
+        /* build/fetch things required to build jsbundle and android */
        nix.build(
          attr: 'targets.mobile.android.release.buildInputs',
          sandbox: false,
@@ -83,7 +84,7 @@ pipeline {
    }
    stage('Build nix shell deps') {
      steps { script {
-        /* Build/fetch deps required to start default Nix shell. */
+        /* build/fetch things required to instantiate shell.nix for TARGET=all */
        nix.build(
          attr: 'shells.default.buildInputs',
          sandbox: false,
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -9,7 +9,7 @@ pipeline {
  options {
    timestamps()
    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 15, unit: 'MINUTES')
+    timeout(time: 10, unit: 'MINUTES')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '10',
@@ -41,6 +41,13 @@ pipeline {
  }

  stages {
+    stage('Prep') {
+      steps {
+        script {
+          utils.doGitRebasePR()
+        }
+      }
+    }
    stage('Checks') {
      parallel {
        stage('Lint') {
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {
  agent { label 'macos' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.2'

 pipeline {
  agent {
@@ -18,7 +18,6 @@

 [Working on PR together with QA team](pipeline_process.md)

-[Debugging](debugging.md)


 ## Testing
@@ -91,11 +91,30 @@ These guidelines make db.cljs namespaces the place to go when making changes to

  - If manual QA is not needed but all tests don't pass, you can ping @churik or @Serhy to confirm that failed E2E tests are not unrelated.

+## Enabling debug logs
+Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
+
+![Enable Debug Logs](images/codebase-structure-and-guidelines/log-settings.png)
+
 ## Translations
 The app relies on system locale to select a language from the [list of supported languages](https://github.com/status-im/status-mobile/blob/bda73867471cf2bb8a68b1cc27c9f94b92d9a58b/src/status_im/i18n_resources.cljs#L9). It falls back to English in cash the system locale is not supported.

 We use Lokalise App to manage [translations](https://translate.status.im/). In case you need to add/remove a key to translations, you only need to change `en.json`. Missing keys fallback to `en.json`. The actual translations will be added by Lokalise.

+## re-frisk
+re-frisk is a state visualization tool written by our very own Andrey (@flexsurfer). To start re-frisk, execute the following command:
+```bash
+$ yarn shadow-cljs run re-frisk-remote.core/start
+```
+
+or you can also use make:
+
+```bash
+$ make run-re-frisk
+```
+
+A server will be started at http://localhost:4567. It might show "not connected" at first. Don't worry and just start using the app. The events and state will populate.
+
 ## Merging approved PRs

 We don't Github's UI to merge. Instead `./scripts/merge-pr.sh` is used to sign and merge PR to `develop`. You first need to enable [GPG signing on you commits](https://github.com/status-im/status-mobile/blob/develop/STARTING_GUIDE.md#configure-gpg-keys-for-signing-commits).
@@ -1,64 +0,0 @@
-# Debugging
-
-## Inspecting re-frame with re-frisk
-`re-frisk` is a state visualization tool written by our very own Andrey (@flexsurfer). With its help you can inspect the current state of app-db, watch event, etc.
-
-![re-frisk](images/debugging/re-frisk.png)
-
-To start `re-frisk`, execute the following command:
-```bash
-$ yarn shadow-cljs run re-frisk-remote.core/start
-```
-
-or you can also use make:
-
-```bash
-$ make run-re-frisk
-```
-
-A server will be started at http://localhost:4567. It might show "not connected" at first. Don't worry and just start using the app. The events and state will populate.
-
-More details about re-frisk are on the [project page](https://github.com/flexsurfer/re-frisk).
-
-## Enabling debug logs
-Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
-
-![Enable Debug Logs](images/debugging/log-settings.png)
-
-
-## Checking status-go logs
-While status mobile works it saves logs from `status-go` to `geth.log` file.
-
-
-### Checking logs from physical device
-To obtain `geth.log` from physical device you need to shake it and in an opened menu select "Share logs". 
-
-![Share logs](images/debugging/share-logs.jpeg)
-
-
-### Checking logs from iOS Simulator
-When developing with iOS simulator it is more convenient to see the `geth.log` updates in real-time.
-To do this:
- open Activity Monitor
- find the "StatusIm" app and doubleclick it
- in the opened window select "Open files and ports" and find the full path to `geth.log` (note that it won't appear until you login to Status app)
-
-![geth.log path](images/debugging/geth-path.png)
-
-
-## Tips
-### From @ilmotta:
-
-Something I find extremely convenient for Android is to use `adb` to tail logs. I don't use macOS so I don't know if the iOS simulator offers a CLI interface with the same capabilities.
-
-But here's what I use for example:
-
-```
- adb shell tail -n 10 -f /storage/emulated/0/Android/data/im.status.ethereum.debug/files/Download/geth.log | grep 'waku.relay'
-``` 
-
-Also to inspect logs in a more flexible manner, instead of the strict output from `make run-metro`, I prefer `adb logcat`. Combined with enabling status-mobile logs in debug by default plus filtering the logs to only what I care during development, I find this helps me inspect the app without running re-frisk because with the debug log level I can already see which events are dispatched (one of the features I like the most from re-frisk).
-
-```
-adb logcat | grep 'ReactNativeJS\|StatusModule\|GoLog'
-```
@@ -365,43 +365,6 @@ dispatch.
    (str "Hello " username)]])
 ```

-### Registering effects
-
-When registering re-frame effects (`reg-fx`), prefer to expose a data-only
-interface because that will allow event handlers to stay pure.
-
-For instance, if an effect needs a `on-success` callback, allow it to receive a
-*re-frame event vector*. This approach is used by us in the [json-rpc/call
-effect](src/status_im2/common/json_rpc/events.cljs), but also by third-party
-effects, such as https://github.com/Day8/re-frame-http-fx. For the complete
-rationale, see [PR #15936](https://github.com/status-im/status-mobile/pull/15936).
-
-### Using the effect `:json-rpc/call`
-
-Prefer the pure version of `:json-rpc/call` (no callbacks).
-
-```clojure
-;; not as good
-(rf/defn accept-contact-request
-  {:events [:activity-center.contact-requests/accept]}
-  [_ contact-id]
-  {:json-rpc/call
-   [{:method     "wakuext_acceptContactRequest"
-     :params     [{:id contact-id}]
-     :on-success #(rf/dispatch [:sanitize-messages-and-process-response %])
-     :on-error   #(rf/dispatch [:activity-center.contact-requests/accept-error contact-id %])}]})
-
-;; better
-(rf/defn accept-contact-request
-  {:events [:activity-center.contact-requests/accept]}
-  [_ contact-id]
-  {:json-rpc/call
-   [{:method     "wakuext_acceptContactRequest"
-     :params     [{:id contact-id}]
-     :on-success [:sanitize-messages-and-process-response]
-     :on-error   [:activity-center.contact-requests/accept-error contact-id]}]})
-```
-
 ### Registering event handlers

 Events must always be declared with the `utils.fx/defn` macro. Also, don't use
@@ -182,6 +182,17 @@ def build_ios_e2e
  )
 end

+def upload_to_diawi(source)
+  diawi(
+    file: source,
+    timeout: 120,
+    check_status_delay: 5,
+    token: ENV['DIAWI_TOKEN']
+  )
+  # save the URL to a file for use in CI
+  File.write('diawi.out', lane_context[SharedValues::UPLOADED_FILE_LINK_TO_DIAWI])
+end
+
 platform :ios do
  desc '`fastlane ios adhoc` - ad-hoc lane for iOS.'
  desc 'This lane is used for PRs, Releases, etc.'
@@ -245,6 +256,27 @@ platform :ios do
    )
  end

+  desc '`fastlane ios clean` - remove inactive TestFlight users'
+  lane :clean do
+    clean_testflight_testers(
+      username: ENV['FASTLANE_APPLE_ID'],
+      days_of_inactivity: 30
+    )
+    # In the future we can try using 'oldest_build_allowed'
+  end
+
+  desc '`fastlane ios upload-diawi` - upload .ipa to diawi'
+  desc 'expects to have an .ipa prepared: `status-ios/StatusIm.ipa`'
+  desc 'expects to have a diawi token as DIAWI_TOKEN env variable'
+  desc 'expects to have a github token as GITHUB_TOKEN env variable'
+  desc "will fails if file isn't there"
+  desc '---'
+  desc 'Output: writes `fastlane/diawi.out` file url of the uploded file'
+  lane :upload_diawi do
+    ipa = ENV['DIAWI_IPA'] || 'status-ios/StatusIm.ipa'
+    upload_to_diawi(ipa)
+  end
+
  desc '`fastlane ios saucelabs` - upload .app to sauce labs'
  desc 'also notifies in a GitHub comments'
  desc 'expects to have an .apk prepared: `result/app.apk`'
@@ -1,3 +1,7 @@
 source 'https://rubygems.org'

 gem 'fastlane', '>= 2.131.0'
+
+plugins_path = ENV['FASTLANE_PLUGINFILE_PATH'] ||
+               File.join(__dir__, 'Pluginfile')
+eval_gemfile(plugins_path) if plugins_path
@@ -3,21 +3,21 @@ GEM
  specs:
    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.4)
+    addressable (2.8.1)
      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.768.0)
-    aws-sdk-core (3.173.0)
+    aws-partitions (1.728.0)
+    aws-sdk-core (3.170.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
+    aws-sdk-kms (1.63.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
+    aws-sdk-s3 (1.119.1)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.212.2)
+    fastimage (2.2.6)
+    fastlane (2.212.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -105,8 +105,11 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-clean_testflight_testers (0.3.0)
+    fastlane-plugin-diawi (2.1.0)
+      rest-client (>= 2.0.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.36.0)
      google-apis-core (>= 0.11.0, < 2.a)
    google-apis-core (0.11.0)
      addressable (~> 2.5, >= 2.5.1)
@@ -137,7 +140,7 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.3.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -145,6 +148,7 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
+    http-accept (1.7.0)
    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
@@ -152,12 +156,16 @@ GEM
    json (2.6.3)
    jwt (2.7.0)
    memoist (0.16.2)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
+    netrc (0.11.0)
    optparse (0.1.1)
    os (1.1.4)
    plist (3.7.0)
@@ -167,6 +175,11 @@ GEM
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
    retriable (3.1.2)
    rexml (3.2.5)
    rouge (2.0.7)
@@ -213,6 +226,8 @@ PLATFORMS

 DEPENDENCIES
  fastlane (>= 2.131.0)
+  fastlane-plugin-clean_testflight_testers
+  fastlane-plugin-diawi

 BUNDLED WITH
-   2.3.9
+   2.4.6
@@ -0,0 +1,6 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-clean_testflight_testers'
+gem 'fastlane-plugin-diawi'
@@ -24,6 +24,8 @@ let

    shellHook = ''
      [ -z "$STATUS_MOBILE_HOME" ] && echo "STATUS_MOBILE_HOME is empty!" && exit 1
+
+      export FASTLANE_PLUGINFILE_PATH=$STATUS_MOBILE_HOME/fastlane/Pluginfile
    '';

    meta = with lib; {
@@ -5,10 +5,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
+      sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
      type = "gem";
    };
-    version = "2.8.4";
+    version = "2.8.1";
  };
  artifactory = {
    groups = ["default"];
@@ -45,10 +45,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
+      sha256 = "0q3q19insq5ablmr6ypq033qg1gsar5mdphhp7xg80rd615cnq97";
      type = "gem";
    };
-    version = "1.768.0";
+    version = "1.728.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10djgbz4k9w3axka8xrhf97h9yh9svi5g5xvncfwnkg6h22w2177";
+      sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
      type = "gem";
    };
-    version = "3.173.0";
+    version = "3.170.0";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
+      sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
      type = "gem";
    };
-    version = "1.64.0";
+    version = "1.63.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
+      sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
      type = "gem";
    };
-    version = "1.122.0";
+    version = "1.119.1";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -357,10 +357,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx";
+      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
      type = "gem";
    };
-    version = "2.2.7";
+    version = "2.2.6";
  };
  fastlane = {
    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
@@ -368,10 +368,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
+      sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml";
      type = "gem";
    };
-    version = "2.212.2";
+    version = "2.212.1";
+  };
+  fastlane-plugin-clean_testflight_testers = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qkcjf7xrnki4v94mcgcm3v2f89vq8clwxx1d5ipv0wwm5ri26c9";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  fastlane-plugin-diawi = {
+    dependencies = ["rest-client"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sjznx9hwlfa7ndv7av870dvl0cvmh68yk381r55ylw4jjvk5mwl";
+      type = "gem";
+    };
+    version = "2.1.0";
  };
  gh_inspector = {
    groups = ["default"];
@@ -389,10 +410,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
+      sha256 = "1mbnmn36z1cnsd6ar76p9wvqi0ac6wlpm1p1lqczivain16qma76";
      type = "gem";
    };
-    version = "0.42.0";
+    version = "0.36.0";
  };
  google-apis-core = {
    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -487,10 +508,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
+      sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
      type = "gem";
    };
-    version = "1.5.2";
+    version = "1.3.0";
  };
  highline = {
    groups = ["default"];
@@ -502,6 +523,16 @@
    };
    version = "2.0.3";
  };
+  http-accept = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
  http-cookie = {
    dependencies = ["domain_name"];
    groups = ["default"];
@@ -563,6 +594,27 @@
    };
    version = "0.16.2";
  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
+      type = "gem";
+    };
+    version = "3.2023.0218.1";
+  };
  mini_magick = {
    groups = ["default"];
    platforms = [];
@@ -623,6 +675,16 @@
    };
    version = "2.2.1";
  };
+  netrc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
  optparse = {
    groups = ["default"];
    platforms = [];
@@ -684,6 +746,17 @@
    };
    version = "3.2.0";
  };
+  rest-client = {
+    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
  retriable = {
    groups = ["default"];
    platforms = [];
@@ -1,2 +1,2 @@
 import "node-libs-react-native/globals";
-import "./result/index.js";
+import "./app/index.js";
@@ -234,7 +234,7 @@ PODS:
    - React
  - react-native-blob-util (0.13.18):
    - React-Core
-  - react-native-blur (4.3.3):
+  - react-native-blur (4.3.2):
    - React-Core
  - react-native-camera-kit (8.0.4):
    - React
@@ -706,7 +706,7 @@ SPEC CHECKSUMS:
  React-logger: 85f4ef06b9723714b2dfa5b0e5502b673b271b58
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
+  react-native-blur: 4db8c7556566df4e8714c1af5762a4ebc99175d5
  react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f
  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
@@ -1354,12 +1354,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
    }

    @ReactMethod
-    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String keycardUID, final String password,
-                                        final String newPassword, final Callback callback) throws JSONException {
+    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException {
        final String keyStoreDir = this.getKeyStorePath(keyUID);
        executeRunnableStatusGoMethod(() -> {
                Statusgo.initKeystore(keyStoreDir);
-                return Statusgo.convertToKeycardAccount(accountData, options, keycardUID, password, newPassword);
+                return Statusgo.convertToKeycardAccount(accountData, options, password, newPassword);
            }, callback);
    }

@@ -67,8 +67,8 @@ public class PushNotificationHelper {
    private static final long DEFAULT_VIBRATION = 300L;
    private static final String CHANNEL_ID = "status-im-notifications";
    public static final String ACTION_DELETE_NOTIFICATION = "im.status.ethereum.module.DELETE_NOTIFICATION";
+    public static final String ACTION_TAP_NOTIFICATION = "im.status.ethereum.module.TAP_NOTIFICATION";
    public static final String ACTION_TAP_STOP = "im.status.ethereum.module.TAP_STOP";
-    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;

    private NotificationManager notificationManager;

@@ -119,8 +119,13 @@ public class PushNotificationHelper {
    private final BroadcastReceiver notificationActionReceiver = new BroadcastReceiver() {
            @Override
            public void onReceive(Context context, Intent intent) {
-                if (intent.getAction() == ACTION_DELETE_NOTIFICATION) {
+                if (intent.getAction() == ACTION_TAP_NOTIFICATION ||
+                    intent.getAction() == ACTION_DELETE_NOTIFICATION) {
+                    String deepLink = intent.getExtras().getString("im.status.ethereum.deepLink");
                    String groupId = intent.getExtras().getString("im.status.ethereum.groupId");
+                    if (intent.getAction() == ACTION_TAP_NOTIFICATION) {
+                        context.startActivity(getOpenAppIntent(deepLink));
+                    }
                    if (groupId != null) {
                        cleanGroup(groupId);
                    }
@@ -136,6 +141,7 @@ public class PushNotificationHelper {
    private void registerBroadcastReceiver() {
        IntentFilter filter = new IntentFilter();
        filter.addAction(ACTION_DELETE_NOTIFICATION);
+        filter.addAction(ACTION_TAP_NOTIFICATION);
        filter.addAction(ACTION_TAP_STOP);
        context.registerReceiver(notificationActionReceiver, filter);
        Log.e(LOG_TAG, "Broadcast Receiver registered");
@@ -695,31 +701,37 @@ public class PushNotificationHelper {

    private StatusMessage createMessage(Bundle data) {
        Person author = getPerson(data.getBundle("notificationAuthor"));
-        long timeStampLongValue = (long) data.getDouble("timestamp");
-        return new StatusMessage(data.getString("id"), author, timeStampLongValue, data.getString("message"));
+        return new StatusMessage(data.getString("id"), author,  data.getLong("timestamp"), data.getString("message"));
    }

    private PendingIntent createGroupOnDismissedIntent(Context context, int notificationId, String groupId, String deepLink) {
        Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
        intent.putExtra("im.status.ethereum.deepLink", deepLink);
        intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }

    private PendingIntent createGroupOnTapIntent(Context context, int notificationId, String groupId, String deepLink) {
-        Intent intent = getOpenAppIntent(deepLink);
-        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
+        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
+        intent.putExtra("im.status.ethereum.deepLink", deepLink);
+        intent.putExtra("im.status.ethereum.groupId", groupId);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
   }

    private PendingIntent createOnTapIntent(Context context, int notificationId, String deepLink) {
-        Intent intent = getOpenAppIntent(deepLink);
-        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
+        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
+        intent.putExtra("im.status.ethereum.deepLink", deepLink);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
   }

    private PendingIntent createOnDismissedIntent(Context context, int notificationId, String deepLink) {
        Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
        intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }

    public void removeStatusMessage(Bundle bundle) {
@@ -692,7 +692,6 @@ RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
 RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
                  accountData:(NSString *)accountData
                  settings:(NSString *)settings
-                  keycardUID:(NSString *)keycardUID
                  currentPassword:(NSString *)currentPassword
                  newPassword:(NSString *)newPassword
                  callback:(RCTResponseSenderBlock)callback) {
@@ -701,7 +700,7 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
 #endif
    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
    StatusgoInitKeystore(multiaccountKeystoreDir.path);
-    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, keycardUID, currentPassword, newPassword);
+    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, currentPassword, newPassword);
    callback(@[result]);
 }

@@ -55,12 +55,12 @@ The [`nix/scripts/shell.sh`](./scripts/shell.sh) script is essentially a wrapper

 # Building

-We will use the `make jsbundle` target as an example of a derivation you can build using Nix:
+We will use the `make jsbundle-android` target as an example of a derivation you can build using Nix:

-1. `make jsbundle` is called by developer
-2. `make` calls `nix/scripts/build.sh targets.mobile.jsbundle`
-3. [`build.sh`](/nix/scripts/build.sh) calls `nix-build --attr targets.mobile.jsbundle` with extra arguments
-4. `nix-build` builds the derivation from [`nix/mobile/jsbundle/default.nix`](/nix/mobile/jsbundle/default.nix)
+1. `make jsbundle-android` is called by developer
+2. `make` calls `nix/scripts/build.sh targets.mobile.android.jsbundle`
+3. [`build.sh`](/nix/scripts/build.sh) calls `nix-build --attr targets.mobile.android.jsbundle` with extra arguments
+4. `nix-build` builds the derivation from [`nix/mobile/android/jsbundle/default.nix`](/nix/mobile/android/jsbundle/default.nix)

 The same can be done for other targets like `targets.mobile.android.release`.
 Except in that case extra arguments are required which is why the [`scripts/release-android.sh`](/scripts/release-android.sh) is used in the `make release-android` target.
@@ -103,6 +103,45 @@
    }
  },

+  {
+    "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4",
+      "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr"
+    },
+    "jar": {
+      "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90",
+      "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494"
+    }
+  },
+
+  {
+    "path": "cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "077d1a0973c23cbbff52dea7365dca4cf9de5ad5",
+      "sha256": "1ccm3l19cgy30hr03n8jgkgzmswdbg520zmg97xk8b16ncn964jn"
+    },
+    "jar": {
+      "sha1": "a98b94cbc84d264ba9892c971cfaf5920c2152f1",
+      "sha256": "0ym20h0h7mw1mxzm1r7smbj65x8nsqj3cszg82mw3aw4a8j32c29"
+    }
+  },
+
+  {
+    "path": "cljsjs/react/17.0.1-0/react-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449",
+      "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da"
+    },
+    "jar": {
+      "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd",
+      "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7"
+    }
+  },
+
  {
    "path": "clout/clout/2.1.2/clout-2.1.2",
    "host": "https://repo.clojars.org",
@@ -975,15 +1014,15 @@
  },

  {
-    "path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0",
+    "path": "org/clojure/tools.logging/0.4.1/tools.logging-0.4.1",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "44b6bd9ac74cb5e2254e1f0b258d53c1829b865d",
-      "sha256": "093jy29w5gm9rp9va6qlhb6096jpf5higyk7sgmbwb5nf53qi3qb"
+      "sha1": "483bbfc82aee3c005bb1ad36dec77ba5d6c5f95c",
+      "sha256": "1qhfigr9am90fx527ax6f7z7xahgsd5hzb4pmi40n79nx3jsc9hf"
    },
    "jar": {
-      "sha1": "84cb5d00caa9df2ee504d46f6107f4708271f619",
-      "sha256": "0x2zzivn38z179lxkw9wbi9n9qwsf466lrd9y27khdz7wbxhscb5"
+      "sha1": "991bebc6e3633b85091ae929d62c116a2584aee7",
+      "sha256": "001sx1ddgx0ys0z1qphzpxjf2w35rikrfjc0h5bvvqbw8ra0vvja"
    }
  },

@@ -1313,15 +1352,15 @@
  },

  {
-    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
+    "path": "re-frame/re-frame/0.12.0/re-frame-0.12.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "b1f70463fba018c5464d3fc0843232fe955c1372",
-      "sha256": "0yqq1kg1si0akr7kx7w1l4vvkdai20na6h6627ibqkgwzivkc5n5"
+      "sha1": "41fd34c15c1cf68eec81435e09d0a79fd8a88276",
+      "sha256": "08c3sxi3sdkay3550vb3gbv5czzdh2kyin4mb8cpd2wd5g2c88sq"
    },
    "jar": {
-      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
-      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
+      "sha1": "3ff92169fe7588ad62dad2d6ea3bf0e5d3e2d224",
+      "sha256": "1m5sjskgjx028s1zpa631bp52y9hjn8l1nr8hrwiwdh09i2kpnk2"
    }
  },

@@ -1352,15 +1391,15 @@
  },

  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "path": "reagent/reagent/1.0.0/reagent-1.0.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
-      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
+      "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336",
+      "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38"
    },
    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+      "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa",
+      "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa"
    }
  },

@@ -6,6 +6,9 @@ camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
 cider/piggieback/0.4.1/piggieback-0.4.1.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
+cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar
+cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar
+cljsjs/react/17.0.1-0/react-17.0.1-0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
@@ -73,7 +76,7 @@ org/clojure/test.check/1.1.0/test.check-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar
 org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar
-org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
+org/clojure/tools.logging/0.4.1/tools.logging-0.4.1.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
 org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
@@ -99,10 +102,10 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 quoin/quoin/0.1.2/quoin-0.1.2.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
+re-frame/re-frame/0.12.0/re-frame-0.12.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
+reagent/reagent/1.0.0/reagent-1.0.0.jar
 refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.1.2/ring-codec-1.1.2.jar
@@ -118,6 +118,7 @@ com.airbnb.android:lottie:3.4.4
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
+com.android.databinding:baseLibrary:3.1.4
 com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
@@ -125,24 +126,28 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
+com.android.databinding:compilerCommon:3.1.4
 com.android.tools.analytics-library:crash:26.2.1
 com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
+com.android.tools.analytics-library:protos:26.1.4
 com.android.tools.analytics-library:protos:26.2.1
 com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
+com.android.tools.analytics-library:shared:26.1.4
 com.android.tools.analytics-library:shared:26.2.1
 com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
+com.android.tools.analytics-library:tracker:26.1.4
 com.android.tools.analytics-library:tracker:26.2.1
 com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
@@ -155,6 +160,7 @@ com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
+com.android.tools.build:aapt2-proto:0.1.0
 com.android.tools.build:aapt2-proto:0.3.1
 com.android.tools.build:aapt2-proto:0.4.0
 com.android.tools.build:aapt2-proto:4.1.0-6503028
@@ -162,6 +168,7 @@ com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
+com.android.tools.build:apksig:3.1.4
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
@@ -175,6 +182,7 @@ com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
+com.android.tools.build:builder-model:3.1.4
 com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
@@ -184,6 +192,7 @@ com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
+com.android.tools.build:builder-test-api:3.1.4
 com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
@@ -193,16 +202,19 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
+com.android.tools.build:builder:3.1.4
 com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
+com.android.tools.build:bundletool:0.1.0-alpha01
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
+com.android.tools.build:gradle-api:3.1.4
 com.android.tools.build:gradle-api:3.2.1
 com.android.tools.build:gradle-api:3.3.1
 com.android.tools.build:gradle-api:3.5.4
@@ -212,11 +224,13 @@ com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
+com.android.tools.build:gradle-core:3.1.4
 com.android.tools.build:gradle:1.1.3
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
+com.android.tools.build:gradle:3.1.4
 com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
@@ -226,6 +240,7 @@ com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
+com.android.tools.build:manifest-merger:26.1.4
 com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
@@ -237,6 +252,7 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
+com.android.tools.ddms:ddmlib:26.1.4
 com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
@@ -256,6 +272,7 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
+com.android.tools.layoutlib:layoutlib-api:26.1.4
 com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
@@ -272,6 +289,7 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-checks:27.1.0
+com.android.tools.lint:lint-gradle-api:26.1.4
 com.android.tools.lint:lint-gradle-api:26.2.1
 com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
@@ -289,6 +307,7 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
+com.android.tools:annotations:26.1.4
 com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
@@ -298,6 +317,7 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
+com.android.tools:common:26.1.4
 com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
@@ -307,12 +327,14 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
+com.android.tools:dvlib:26.1.4
 com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
+com.android.tools:repository:26.1.4
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
@@ -322,6 +344,7 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
+com.android.tools:sdklib:26.1.4
 com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
@@ -331,6 +354,7 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
+com.android.tools:sdk-common:26.1.4
 com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
@@ -367,7 +391,7 @@ com.facebook.soloader:annotation:0.10.1
 com.facebook.soloader:nativeloader:0.10.1
 com.facebook.soloader:soloader:0.10.1
 com.facebook.yoga:proguard-annotations:1.19.0
-com.github.Dimezis:BlurView:version-2.0.3
+com.github.Dimezis:BlurView:version-2.0.2
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
 com.github.bumptech.glide:disklrucache:4.12.0
@@ -391,11 +415,13 @@ com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.2.4
 com.google.code.gson:gson:2.3
+com.google.code.gson:gson:2.7
 com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.errorprone:error_prone_annotations:2.0.18
+com.google.errorprone:error_prone_annotations:2.1.2
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
@@ -569,7 +595,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
+org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
+org.jetbrains.kotlin:kotlin-stdlib:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
@@ -122,12 +122,14 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.1.4/baseLibrary-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.1.4/compilerCommon-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
@@ -155,28 +157,33 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.1.4/protos-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.1.4/shared-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.1.4/tracker-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.1.4/annotations-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.1.0/aapt2-proto-0.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.0-6503028/aapt2-proto-4.1.0-6503028.pom
@@ -184,6 +191,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.1.4/apksig-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
@@ -194,36 +202,43 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.1.4/builder-model-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.1.4/builder-test-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.1.4/builder-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.1.0-alpha01/bundletool-0.1.0-alpha01.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.1.4/gradle-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.1.4/gradle-core-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.1.4/gradle-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
@@ -238,24 +253,28 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.1.4/manifest-merger-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.1.4/common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.1.4/ddmlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.1.4/dvlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
@@ -269,6 +288,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/27.1.0/uast-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.1.4/layoutlib-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
@@ -279,6 +299,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.1.0/l
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/27.1.0/lint-checks-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.1.4/lint-gradle-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
@@ -290,18 +311,21 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.1.0/lint-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.1.4/repository-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.1.4/sdklib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.1.4/sdk-common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
@@ -310,7 +334,7 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-
 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/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
-https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.3/BlurView-version-2.0.3.pom
+https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.2/BlurView-version-2.0.2.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.pom
@@ -472,15 +496,17 @@ 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/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.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.1.2/error_prone_annotations-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.19.0/error_prone_annotations-2.19.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.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.1.2/error_prone_parent-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.2/error_prone_parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.19.0/error_prone_parent-2.19.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.18.0/error_prone_parent-2.18.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -546,10 +572,10 @@ 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/javax.activation/1.2.0/javax.activation-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.2.0/istack-commons-runtime-4.2.0.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/3.0.7/istack-commons-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.2.0/istack-commons-4.2.0.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.2/jaxb-bom-ext-4.0.2.pom
@@ -577,7 +603,7 @@ https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/3.4.3/gradle-download-task-3.4.3.pom
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/4.0.2/gradle-download-task-4.0.2.pom
 https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
-https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.pom
+https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.1/jakarta.activation-api-2.1.1.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0/jakarta.xml.bind-api-parent-4.0.0.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.pom
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
@@ -693,7 +719,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.8/checker-qual-2.5.8.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.34.0/checker-qual-3.34.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.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-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -713,8 +739,8 @@ https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/eas
 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.1.0/easymock-parent-5.1.0.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock/5.1.0/easymock-5.1.0.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.1/angus-activation-project-2.0.1.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.1/angus-activation-2.0.1.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.0/angus-activation-project-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.0/angus-activation-2.0.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.8/project-1.0.8.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
@@ -735,9 +761,9 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-cor
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.10/org.jacoco.build-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.8/org.jacoco.build-0.8.8.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.10/org.jacoco.core-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
@@ -818,6 +844,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.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-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
@@ -842,7 +870,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.3
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20230227/json-20230227.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.2/junit-bom-5.9.2.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/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
@@ -852,7 +880,6 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.5/asm-bom-9.5.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
@@ -30,9 +30,9 @@ react-native-orientation-locker
 react-native-permissions
 react-native-randombytes
 react-native-reanimated
+react-native-safe-area-context
 react-native-shake
 react-native-share
-react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
@@ -14,12 +14,12 @@ declare -a REPOS=(
  "https://jitpack.io"
 )

-function nix_prefetch() {
-    nix store prefetch-file --json "${1}" 2>/dev/null
+function nix_fetch() {
+    nix-prefetch-url --print-path --type sha256 "${1}" 2>/dev/null
 }

-function get_nix_path() { echo "${1}" | jq -r .storePath; }
-function get_nix_sha() { echo "${1}" | jq -r .hash; }
+function get_nix_path() { echo "${1}" | tail -n1; }
+function get_nix_sha() { echo "${1}" | head -n1; }
 function get_sha1() { sha1sum "${1}" | cut -d' ' -f1; }

 # Assumes REPOS from repos.sh is available
@@ -44,9 +44,9 @@ function fetch_and_template_file() {
    local OBJ_URL OBJ_NIX_FETCH_OUT OBJ_NAME OBJ_PATH

    OBJ_URL="${REPO_URL}/${PKG_PATH}/${FILENAME}"
-    if ! OBJ_NIX_FETCH_OUT=$(nix_prefetch "${OBJ_URL}"); then
+    if ! OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_URL}"); then
        echo " ! Failed to fetch: ${OBJ_URL}" >&2
-        return 1
+        exit 1
    fi

    OBJ_NAME="${FILENAME}"
@@ -58,10 +58,6 @@ function fetch_and_template_file() {
      }"
 }

-function fetch_and_template_file_no_fail() {
-    fetch_and_template_file "${1}" 2>/dev/null || true
-}
-
 if [[ -z "${1}" ]]; then
    echo "Required POM URL argument not given!" >&2
    exit 1
@@ -85,7 +81,7 @@ PKG_PATH="${PKG_URL_NO_EXT#"${REPO_URL}/"}"
 PKG_PATH="$(dirname "${PKG_PATH}")"

 # Both JARs and AARs have a POM
-POM_NIX_FETCH_OUT=$(nix_prefetch "${PKG_URL_NO_EXT}.pom")
+POM_NIX_FETCH_OUT=$(nix_fetch "${PKG_URL_NO_EXT}.pom")
 POM_PATH=$(get_nix_path "${POM_NIX_FETCH_OUT}")
 POM_NAME=$(basename "${PKG_URL_NO_EXT}.pom")
 if [[ -z "${POM_PATH}" ]]; then
@@ -115,7 +111,7 @@ echo -ne "
      }"

 # Some deps are just POMs, in which case there is no JAR to fetch.
-[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file_no_fail "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "jar" ]]     && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "bundle" ]]  && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" =~ aar* ]]      && fetch_and_template_file "${PKG_NAME}.aar"
@@ -1,10 +1,14 @@
 { pkgs, deps, callPackage, mkShell
-, jsbundle, status-go, androidPkgs, androidShell }:
+, status-go, androidPkgs, androidShell }:

-rec {
-  release = callPackage ./release.nix {
-    inherit jsbundle status-go;
-  };
+let
+  # Import a jsbundle compiled out of clojure codebase
+  jsbundle = callPackage ./jsbundle { };
+
+  release = callPackage ./release.nix { inherit jsbundle status-go; };
+in {
+  # TARGETS
+  inherit release jsbundle;

  shell = mkShell {
    buildInputs = with pkgs; [
@@ -8,9 +8,9 @@
 { secretsFile ? "" }:

 stdenv.mkDerivation {
-  name = "status-mobile-jsbundle";
+  name = "status-mobile-build-jsbundle-android";
  src =
-    let path = ./../../..;
+    let path = ./../../../..;
    # We use builtins.path so that we can name the resulting derivation,
    # otherwise the name would be taken from the checkout directory,
    # which is outside of our control inherit path;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
          ignoreVCS = false;
          include = [ 
            "VERSION" "BUILD_NUMBER" "scripts/version/.*"
-            "src/.*" "shadow-cljs.edn"
+            "src/.*" "shadow-cljs.edn" "index.js"
            # I want to avoid including the whole .git directory
            ".git/HEAD" ".git/objects" ".git/refs/heads/.*"
            # shadow-cljs expects these for deps resolution
@@ -77,6 +77,6 @@ stdenv.mkDerivation {
  '';
  installPhase = ''
    mkdir -p $out
-    cp -r result/* $out/
+    cp -r index.js app $out/
  '';
 }
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
      root = path;
      include = [
        "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
-        "resources/.*" "translations/.*" "src/js/.*" "index.js"
+        "resources/.*" "translations/.*" "src/js/.*"
        "modules/react-native-status/android.*" "android/.*"
        envFileName "VERSION" "status-go-version.json" "react-native.config.js"
      ];
@@ -94,10 +94,8 @@ in stdenv.mkDerivation rec {
    # Export all vars from .env file
    export $(cut -d= -f1 .env)

-    # Symlink React Native entrypoint.
-    cp -Lr ${builtJsBundle} ./result
-    pwd
-    find -L result
+    # Copy index.js and app/ input files
+    cp -ra --no-preserve=ownership ${builtJsBundle}/* ./

    # Copy android/ directory
    mkdir -p ./android/build
@@ -3,10 +3,7 @@
 let
  fastlane = callPackage ./fastlane { };

-  jsbundle = callPackage ./jsbundle { };
-
  android = callPackage ./android {
-    inherit jsbundle;
    status-go = status-go.mobile.android;
  };

@@ -29,5 +26,5 @@ in {
  };

  # TARGETS
-  inherit android ios fastlane jsbundle;
+  inherit android ios fastlane;
 }
@@ -8,9 +8,6 @@ assert stdenv.isDarwin;

 stdenv.mkDerivation {
  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
-  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
-  # https://github.com/NixOS/nixpkgs/pull/228696
-  __noChroot = stdenv.isDarwin;
  buildCommand = ''
    mkdir -p $out/bin
    cd $out/bin
@@ -16,10 +16,10 @@
    "@babel/preset-typescript": "^7.17.12",
    "@react-native-async-storage/async-storage": "^1.17.9",
    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.3-status",
+    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.2-status",
    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
    "@react-native-community/clipboard": "^1.2.2",
-    "@react-native-community/hooks": "^3.0.0",
+    "@react-native-community/hooks": "^2.5.1",
    "@react-native-community/masked-view": "^0.1.6",
    "@react-native-community/netinfo": "^4.4.0",
    "@react-native-community/push-notification-ios": "^1.4.1",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Omar Basem	f357e67529	lint	2023-04-26 13:38:53 +04:00
Omar Basem	a7b27a0ef3	updates	2023-04-26 13:29:57 +04:00
Omar Basem	88aeb0ccfb	updates	2023-04-26 13:29:57 +04:00
Omar Basem	b54d8ad5f3	udpates	2023-04-26 13:29:57 +04:00
Omar Basem	7666026764	updates	2023-04-26 13:29:56 +04:00
Omar Basem	963745ecb6	updates	2023-04-26 13:29:56 +04:00
Omar Basem	c689b81e01	udpates	2023-04-26 13:29:56 +04:00
Omar Basem	b0f0e29706	review	2023-04-26 13:29:55 +04:00
Omar Basem	b035c4621b	lint	2023-04-26 13:29:55 +04:00
Omar Basem	10eb4330e6	review	2023-04-26 13:29:55 +04:00
Omar Basem	c5d472ab9b	revert pod	2023-04-26 13:29:55 +04:00
Omar Basem	1ae8dae700	lint	2023-04-26 13:29:54 +04:00
Omar Basem	35fb6354c6	composer reply	2023-04-26 13:29:54 +04:00
@@ -1 +1 @@
 .23.0
 .22.0