feat: Add script to import & sync external PRs

This commit adds a script which requires 2 arguments :
- full PR link
- branch url of the forked repository

This script will then import the branch from the forked repository and create a new PR with it.
This new PR will have title and descriptions copied over from the original PR.

This helps in running CI pipelines for external contributors.

.carve_ignore

@@ -95,11 +95,11 @@ status-im.hardwallet.simulated-keycard/sign-typed-data
 status-im.utils.core/safe-read-message-content
 status-im.ui.components.react/native-modules
 status-im.ui.components.react/progress-bar
-react-native.fs/move-file
-react-native.fs/read-dir
-react-native.fs/mkdir
-react-native.fs/unlink
-react-native.fs/file-exists?
+status-im.utils.fs/move-file
+status-im.utils.fs/read-dir
+status-im.utils.fs/mkdir
+status-im.utils.fs/unlink
+status-im.utils.fs/file-exists?
 quo.animated/code
 quo.animated/eq
 quo.animated/neq

.env.e2e

@@ -32,4 +32,3 @@ DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1

.env.jenkins

@@ -34,4 +34,3 @@ TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1

.env.nightly

@@ -21,4 +21,3 @@ BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=0

.github/ISSUE_TEMPLATE/bug-report.md

@@ -2,7 +2,7 @@
 name: MVPBug Report
 about: MVPBug Report
 title: ''
-labels: 'E:Mobile Bug MVP'
+labels: 'E:Mobile Bugfixes MVP'
 assignees: ''
 
 ---

Makefile

@@ -46,10 +46,7 @@ export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
 # Location of symlinks to derivations that should not be garbage collected
 export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
-	BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
-	ANDROID_GRADLE_OPTS,ANDROID_ABI_SPLIT,ANDROID_ABI_INCLUDE,\
-	STATUS_GO_SRC_OVERRIDE,STATUS_GO_IPFS_GATEWAY_URL
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
 
 # Useful for Android release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)

android/app/build.gradle

@@ -168,7 +168,6 @@ def getVersionCode = { ->
 
 def getVersionName = { ->
     new ByteArrayOutputStream().withStream { stdOut ->
-        // TODO: probably not used, cleanup
         if (project.hasProperty("releaseVersion")) {
             return project.releaseVersion
         }

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 /* 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.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 pipeline {
   agent { label 'linux' }
@@ -9,6 +9,8 @@ pipeline {
     disableConcurrentBuilds()
     /* Prevent Jenkins jobs from running forever */
     timeout(time: 40, unit: 'MINUTES')
+    /* Allow copying of artifacts from this job. */
+    copyArtifactPermission('/status-mobile/e2e/*')
     /* Limit builds retained */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
@@ -47,6 +49,9 @@ pipeline {
         stage('Android') { steps { script {
           apk = jenkins.Build('status-mobile/platforms/android')
         } } }
+        stage('Android e2e') { steps { script {
+          apke2e = jenkins.Build('status-mobile/platforms/android-e2e')
+        } } }
         stage('Tests') { steps { script {
           jenkins.Build('status-mobile/platforms/tests')
         } } }
@@ -56,7 +61,9 @@ pipeline {
       steps { script {
         sh('rm -f pkg/*')
         jenkins.copyArts(ios)
+        //jenkins.copyArts(iose2e)
         jenkins.copyArts(apk)
+        jenkins.copyArts(apke2e)
         sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
         dir('pkg') {
           /* generate sha256 checksums for upload */
@@ -70,8 +77,8 @@ pipeline {
         /* object for easier URLs handling */
         urls = [
           /* mobile */
-          Apk: utils.pkgUrl(apk),
-          iOS: utils.pkgUrl(ios),
+          Apk: utils.pkgUrl(apk), Apke2e: utils.pkgUrl(apke2e),
+          iOS: utils.pkgUrl(ios), /*iOSe2e: utils.pkgUrl(iose2e),*/
           Diawi: utils.getEnv(ios, 'DIAWI_URL'),
           /* upload the sha256 checksums file too */
           SHA: s3.uploadArtifact(sha),
@@ -95,6 +102,17 @@ pipeline {
         }
       } }
     }
+    stage('Run e2e') {
+      when { expression { btype == 'nightly' && params.PUBLISH } }
+      steps { script {
+        e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
+        build(
+          job: 'status-mobile/e2e/status-app-nightly',
+          parameters: [string(name: 'APK_URL', value: e2eApk)],
+          wait: false
+        )
+      } }
+    }
   }
 }
 

ci/Jenkinsfile.e2e-nightly

@@ -1,51 +0,0 @@
-#!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
-
-pipeline {
-  agent { label 'linux' }
-
-  triggers {
-    // Nightly at 2am
-    cron 'H 2 * * *'
-  }
-
-  parameters {
-    string(
-      name: 'BRANCH',
-      description: 'Name of the branch to checkout and build.',
-      defaultValue: 'develop',
-    )
-  }
-
-  options {
-    timestamps()
-    disableConcurrentBuilds()
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-    ))
-  }
-
-  stages {
-    stage('Build') {
-      steps {
-        script {
-          apk_build = jenkins.Build('status-mobile/platforms/android-e2e')
-          apk_build_number = apk_build.getNumber().toString()
-        }
-      }
-    }
-    stage('Run e2e') {
-      steps {
-        build(
-          job: 'status-mobile/e2e/status-app-nightly',
-          parameters: [
-            string(name: 'APK_BUILD_NUMBER', value: apk_build_number),
-            string(name: 'BRANCH', value: env.BRANCH),
-          ]
-        )
-      }
-    }
-  }
-}
-

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 /* 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.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 pipeline {
 
@@ -7,24 +7,14 @@ pipeline {
 
   parameters {
     string(
-      name: 'APK_BUILD_NUMBER',
-      description: 'platform/e2e build number for apk artifact',
+      name: 'APK_URL',
+      description: 'URL of APK uploaded to SauceLabs.',
     )
     string(
       name: 'KEYWORD_EXPRESSION',
       description: 'This will run tests which contain names that match the given string expression  (Optional)',
       defaultValue: '',
     )
-    string(
-      name: 'BRANCH',
-      description: 'Name of the branch to checkout and build.',
-      defaultValue: 'develop',
-    )
-    string(
-      name: 'TR_CASE_IDS',
-      description: 'IDs of the TestRail case, separated by a comma (Optional)',
-      defaultValue: '',
-    )
   }
 
   options {
@@ -33,14 +23,15 @@ pipeline {
 
   stages {
     stage('Fetch') {
+      when { expression { !params.APK_URL } }
       steps { script {
         copyArtifacts(
-          projectName: "status-mobile/platforms/android-e2e",
-          filter: 'result/*-x86.apk',
-          selector: specific(env.APK_BUILD_NUMBER),
+          projectName: "status-mobile/nightly",
+          filter: '*-x86.apk',
+          /* WARNING: This copies the latest available artifact. */
+          selector: lastWithArtifacts(),
         )
-        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86.apk')}"
-
+        apk_path = "${env.WORKSPACE}/${utils.findFile('*-x86.apk')}"
       } }
     }
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

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

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.7.12'
+library 'status-jenkins-lib@v1.7.9'
 
 pipeline {
   agent {

doc/decisions/0014-wallet-team.md

@@ -16,7 +16,7 @@ The responsibilities of the team are to implement the new wallet UI, with the su
 
 ## Decision
 
-The team members for the initial wallet team are:
+Some team members have already expressed interest and some have been asked and accepted to join the wallet team, these team members are:
 
 - @rasom
 - @OmarBasem
@@ -25,6 +25,7 @@ The team members for the initial wallet team are:
 - @briansztamfater
 - @smohamedjavid
 - @ulisesmac
-- @erikseppanen
-- @mmilad75
-- @tumanov-alex
+
+# Follow-up Actions
+
+- We still need 3/4 team members to join the wallet team

doc/decisions/0015-team-structure.md

@@ -33,7 +33,7 @@ The people identified for each sections are as follow:
 
 - Messaging @flexsurfer, followed by @alwx
 - Syncing & Onboarding @siddarthkay
-- Communities @ilmotta, followed by @ajayesivan
+- Communities @ilmotta
 - Activity Center & Shell @J-Son89, followed by @Parveshdhull
 - Wallet (once the vertical team is created) @J-Son89, followed by @briansztamfater
 

doc/merging-pr-process.md

@@ -40,9 +40,7 @@ In practice, this means that sometimes they need to be merged in lockstep.
   git push origin vx.y.z
 ```
 5) Update status-mobile with the new status-go version, using the new tag `scripts/update-status-go.sh "vx.y.z"`
-6) If you had to rebase status-go to include new changes, e2e test MUST be re-run. If there's any issue you will
-   have to fix in status-go with another PR and follow the same process.
-7) In status-mobile, push, rebase against `develop` and merge it 🚀
+6) In status-mobile, push, rebase against `develop` and merge it 🚀
 
 
 important note : make sure your status-go PRs get a tested-ok by QA before merging them in. 

doc/new-guidelines.md

@@ -1,9 +1,8 @@
 # Code Style Guidelines
 
-> [!IMPORTANT]
-> The goal of this document is to help all contributors (core and external) to
-> write code in _unison_ and help establish good practices that serve the Status
-> Mobile contributors well.
+>The goal of this document is to help all contributors (core and external) to
+>write code in _unison_ and help establish good practices that serve the Status
+>Mobile contributors well.
 
 We don't want to turn this document into an exhaustive list of rules to be
 followed that nobody will read. As much as possible, we'll try to document only
@@ -11,28 +10,35 @@ what we consider important for Status Mobile. In other words, we don't want to
 maintain a general Clojure convention/style guide, nor do we want to turn this
 document into a long tutorial.
 
-> [!WARNING]
-> This is a **work in progress**, and not all conventions are properly
-> implemented in the codebase yet. The project structure is also undergoing
-> major changes, and it will take a considerable amount of time until we migrate
-> the existing code to the new structure.
+This is a **work in progress**, and not all conventions are properly implemented
+in the codebase yet. The project structure is also going over major changes (as
+of Nov/2022), and it'll take a considerable amount of time until we migrate the
+existing code to the new structure.
 
 If you find out anything is outdated or missing, please, share with us or even
 better, create a pull-request! 🤸
 
 ## Style guide
 
-We follow the [Clojure Style
-Guide](https://github.com/bbatsov/clojure-style-guide) and we use
-[zprint](https://github.com/kkinnear/zprint) to format Clojure code. Running
-`make lint-fix` should fix most formatting issues, but not all of them.
+We mostly follow the [Clojure Style
+Guide](https://github.com/bbatsov/clojure-style-guide), so it's recommended to
+get familiar with it.
+
+As of Nov/2022, running `make lint` should fix the most basic formatting issues,
+and we are in the process of integrating a tool to format non-trivial code
+according to the Clojure Style Guide. This should greatly reduce noise in
+pull-request reviews and it'll simplify the life of all contributors.
+
+Pay special attention to:
+
+- Align let bindings https://github.com/bbatsov/clojure-style-guide#bindings-alignment
+- Align map keys https://github.com/bbatsov/clojure-style-guide#map-keys-alignment
 
 ## Dos and don'ts
 
 ### Hiccup
 
-Never use anonymous inline function in hiccup, this will lead to
-reinitialization of component on each render of parent component.
+Never use anonymous inline function in hiccup, this will lead to reinitialization of component on each render of parent component
 
 ```clojure
 ;; bad
@@ -51,7 +57,7 @@ reinitialization of component on each render of parent component.
    [comp]])
 ```
 
-This mistake mostly happens with functional components.
+This mistake mostly happens with functional components
 
 ```clojure
 ;; bad
@@ -65,24 +71,20 @@ This mistake mostly happens with functional components.
 ;; good
 (defn f-comp [atom]
  [rn/text atom])
-
+         
 (fn []
  (let [atom (rf/sub [:sub])]
    (fn []
-     [:f> f-comp atom])))
+     [:f> f-comp atom]))) 
 ```
 
-It's important to name functional components with `f-` prefix.
+it's important to name functional components with `f-` prefix
 
 ### Component props and API scheme to match Figma as closely as possible
 
-Ideally, the prop names for components (particularly in quo2 Design System)
-should match the Figma properties as best as possible. This makes it easier for
-the developer using that component to configure it correctly for the screen it
-is being used on and avoids unnecessary overwrites and adjustments being made.
+Ideally, the prop names for components (particularly in quo2 Design System) should match the Figma properties as best as possible. This makes it easier for the developer using that component to configure it correctly for the screen it is being used on and avoids unnecessary overwrites and adjustments being made.
 
 #### Avoid unnecessarily grouping categories to reduce the number of props
-
 For example in Figma if there is a component and it has the following variants:
 
 |theme: "light" blur: "False"|theme: "dark" blur: "False"|theme: "light" blur: "True"|theme: "dark"  blur: "True"|
@@ -105,18 +107,12 @@ type - can be :neutral :active :danger :danger-blur"
 (defn my-component [{:keys [theme blur? type]} label])
 ```
 
-Please note this is only for the external API of the component and there should
-be no restriction of how the component manages its internal API as that will not
-affect the developer using the component with the issues described above.
+Please note this is only for the external API of the component and there should be no restriction of how the component manages its internal API as that will not affect the developer using the component with the issues described above.
 
-In some cases this is not always possible or does not make sense. However the
-thought process should be how easy will it be for another developer to use this
-component with the correct configuration given the screen designs for Figma.
+In some cases this is not always possible or does not make sense. However the thought process should be how easy will it be for another developer to use this component with the correct configuration given the screen designs for Figma.
 
-#### Avoid unnecessarily renaming props
-
-In general it can be helpful to avoid renaming props from their counterpart in
-Figma.
+#### Avoid unnecessarily renaming props 
+In general it can be helpful to avoid renaming props from their counterpart in Figma.
 
 For example if Figma has sizes `:small`, `:medium` and `:large`
 
@@ -157,7 +153,7 @@ the source file. For a real example, see
 
 ### Always add styles inside the `:style` key
 
-Although when compiling ReactNative for mobile some components are able work with
+Although when compiling ReactNative for mobile some components are able work with 
 their styles in the top-level of the properties map, prefer to add them inside the
 `:style` key in order to separate styles from properties:
 
@@ -176,11 +172,12 @@ their styles in the top-level of the properties map, prefer to add them inside t
             :on-press #(js/alert "Hi!")
             :title    "Button"}]
 
-;; better
+;; better 
 ;; (define them in a style ns & place them inside `:style` key)
 [rn/button {:style    (style/button)
             :on-press #(js/alert "Hi!")
-            :title    "Button"}]
+            :title    "Button"}
+ ]
 ```
 
 Also its fine to keep one liner styles in view
@@ -192,7 +189,7 @@ Also its fine to keep one liner styles in view
 
 ### Don't define properties in styles ns
 
-Properties must be set on view level
+Properties must be set on view level 
 
 ```clojure
 ;; bad
@@ -212,8 +209,10 @@ Properties must be set on view level
  :bottom           0}
 ```
 
+
 ### Apply animated styles in the style file
 
+
 ```clojure
 ;; bad
 (defn circle
@@ -246,37 +245,24 @@ Joshua Comeau.
 [rn/view {:style {:padding-horizontal 20}}]
 ```
 
-### Use a question mark to convey the value is a boolean
+### Don't prepend booleans with is-
 
-The Clojure Style Guide suggests using a question mark only in [predicate
-functions](https://guide.clojure.style/#naming-predicates), but nothing is
-mentioned about other symbols and keywords. We prefer to extend the convention
-to all boolean references.
+It is a common practice in JavaScript and other languages to prepend boolean variable names with `is-*`. 
+In ClojureScript it is common practice to suffix boolean variable names with a `?`. 
+There is no need for both of these and so it is preferable to stick with the latter.
 
 ```clojure
 ;; bad
 (let [is-open? true] ...)
-(def flag-is-enabled false)
 
 ;; good
 (let [open? true] ...)
-(def flag-enabled? false)
-```
-
-And for keywords too:
-
-```clojure
-;; bad
-[some-component {:logged-in true}]
-
-;; good
-[some-component {:logged-in? true}]
 ```
 
 ### Styles def vs defn
 
-Always use `def` over `defn` if there are no dynamic values. This helps cut the
-cost of function calls.
+Always use `def` over `defn`, unless the style relies on dynamic values, such as
+deref'ed atoms.
 
 ```clojure
 ;; bad
@@ -300,18 +286,15 @@ cost of function calls.
 
 ### Custom Colors
 
-The Status designs have a lot of customization of user and group colors. For
-consistency it is best to use `customization-color` as the prop key on pages and
-components. This will help easily identify what pages and components in the
-application are using customized colors.
+The Status designs have a lot of customization of user and group colors with components and pages. For consistency it is best to use `customization-color` as the prop key on pages and components. This will help easily identify what pages and components in the application are using customized colors.
 
 ```clojure
 ;; bad
-(defn community-card [{keys [custom-color]}]
+(defn community-card [{keys [custom-color]}] 
   ...)
 
 ;; good
-(defn community-card [{keys [customization-color]}]
+(defn community-card [{keys [customization-color]}] 
   ...)
 ```
 
@@ -535,9 +518,9 @@ the `quo2/` directory.
 
 ;; good
 (ns my-namespace
-  (:require [quo2.core :as quo]))
+  (:require [quo2.core :as quo2]))
 
-(quo/icon :i/verified)
+(quo2/icon :i/verified)
 
 ;; also good because both namespaces are inside quo2/
 (ns quo2.components.tabs.account-selector
@@ -604,7 +587,8 @@ indices.
 
 ### Icons
 
-Use the appropriate keyword qualification/namespace.
+Use the appropriate keyword qualification/namespace and don't directly require
+namespaces inside `quo2/components/`.
 
 ```clojure
 ;; bad
@@ -798,9 +782,9 @@ Clojure (JVM) codebases which mirror the sources in a top-level test directory.
 └── models_test.cljs
 ```
 
-Component tests should be created in the same directory as the source component,
-and named as `component_spec.cljs`.
-
+Component tests should be created in a separate directory `__tests__`, colocated
+with the source. When the entire component implementation is isolated under a
+single directory, create a test file named `component_spec.cljs` instead.
 
 ```
 └── filter

doc/pipeline_process.md

@@ -30,7 +30,7 @@ Ready for testing PR should meet the following criteria:
 3. Wait for the review.
 4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
 5. Once the PR has been approved by reviewer(s) - label `request-manual-qa` should be applied to the PR
-6. Move PR to the E2E column when it is ready for testing (**mandatory for all PRs**). That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
+6. Move PR to the E2E column when it is ready for testing. That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
 
 After that - PR will be taken into manual testing by the QA team.
 
@@ -41,37 +41,27 @@ After that - PR will be taken into manual testing by the QA team.
 - QA engineer picks up one of PRs with the ```request-manual-qa``` label, drags the item to the ```IN TESTING``` column and assigns it to themselves.
 - During testing, QA will add comments describing the issues found, and also review automation tests results.
 Usually found issues are numbered as "Issue 1, Issue 2", etc.
-When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
-- When manual testing of the PR is fully completed and all the issues are fixed, the QA adds the ```Tested - OK``` label and drags the card to the ```Design review``` column (the cases when design review is necessary are described below).
-- If design review is not required, the QA drags the PR to the ```MERGE``` column. After that the developer merges PR into develop.
-- If design review has been done, the designer (```@Francesca-G```) drags the PR to the ```MERGE``` column.
-After that the developer merges PR into develop.
-- If manual testing/design review was not carried out, the developer drags PR to the ```MERGE``` column themselves.
-
-### Design review
-_**How do I know if a design review is needed?**_
-
-There are three cases here depending on the changes in the PR:
-1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments. 
-2. **Component PRs:** can be moved directly to the ```Design review``` column by the developer when get a review from devs (manual testing step can be skipped) + the developer mentions ```@Francesca-G``` in comments.
-3. **Functional PRs changes in which are not related to UI (e.g. a crash fix):** skip the ```Design review``` step (the PR should only be manually tested by QA).
-
-There are three possible scenarios when the design review is completed:
-1. **Approved by design**  > the PR is moved to the ```MERGE``` column by Francesca
-2. **Some changes requested, but can be fixed as followups** > need to be negotiated with Francesca  > Francesca moves PR to the ```MERGE``` column and adds the ```Follow-up required``` label >  follow-ups should be added **by the dev** right after the PR is merged
-3. **Some changes requested, they should be fixed before merge** > Francesca reviews the PR again after the fixes and moves PR to the ```MERGE``` column from ```Design review```
-
----
-**Notes:**
-- If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
-- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
----        
+When the first round of testing is completed and all issues for this stage are found, tester can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
+- When manual testing of PR is fully completed and all issues are fixed, QA adds the ```Tested - OK``` label and drags the card to the ```MERGE``` column, after which developer merges PR into develop.
+  If manual testing was not carried out, developer drags PR to the ```MERGE``` column themselves.
 
+    **Notes:** 
+        - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
+        - if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+        
 #### Why my PR is in `Contributor` column?
 PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues`.
 In the first case most often this happens due to conflicting files in PR.
 In the second case - after fixing of all found issues, the developer should ping the QA in the PR comments for retesting.
 
+
+#### Why is my PR in `To Rebase` column?
+PR is moved to the "To Rebase" column in two cases:
+- automatically by github bot if PR branch has conflicts that should be resolved
+- manually (by QAs) if PR branch is out-of-date with the base branch and requires rebasing to the latest develop
+
+If PR appeared in the "To Rebase" column dev who is working on the PR should resolve conflicts/rebase branch to the latest develop. After resolving conflicts/rebasing PR should be moved by developer to the right column depending on PR work progress.
+
 ## Merging a PR
 **Merge conditions:**
 1. Required number of reviews received
@@ -83,7 +73,6 @@ In the second case - after fixing of all found issues, the developer should ping
 
 
 6. In case of manual testing - the label ```Tested - OK``` from QA
-7. In case of design review - the approval from the designer
 
 
 You can merge your PR into develop - some useful clues you can find [here](https://notes.status.im/setup-e2e#3-Merging-PR) 

ios/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - boost (1.76.0)
-  - BVLinearGradient (2.8.0):
-    - React-Core
+  - BVLinearGradient (2.5.6):
+    - React
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.69.10)
@@ -425,8 +425,8 @@ PODS:
     - React-Core
   - RNStaticSafeAreaInsets (2.2.0):
     - React-Core
-  - RNSVG (13.10.0):
-    - React-Core
+  - RNSVG (9.13.6):
+    - React
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
   - SDWebImage/Core (5.11.1)
@@ -701,7 +701,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
-  BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
+  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991
@@ -772,10 +772,10 @@ SPEC CHECKSUMS:
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: d0db0ee059c33381bca787a2193c27e52750ccaf
+  RNReanimated: 43adb0307a62c1ce9694f36f124ca3b51a15272a
   RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
   RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
-  RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
+  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
@@ -785,6 +785,6 @@ SPEC CHECKSUMS:
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: d24d6184b6b85f742536bd93bd07d69d7b9bb4c1
 
-PODFILE CHECKSUM: 1b60eee24bff3a6287f8b33e57657289b2966342
+PODFILE CHECKSUM: a7c3cb360cf217ab90667d67deeab588677d540a
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -823,11 +823,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
     }
 
-    @ReactMethod
-    public void startSearchForLocalPairingPeers(final Callback callback) throws JSONException {
-        executeRunnableStatusGoMethod(() -> Statusgo.startSearchForLocalPairingPeers(), callback);
-    }
-
     @ReactMethod
     public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
          final JSONObject jsonConfig = new JSONObject(configJSON);
@@ -1177,19 +1172,19 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
+    @ReactMethod(isBlockingSynchronousMethod = true) 
     public String keystoreDir() {
         final String absRootDirPath = this.getNoBackupDirectory();
         return pathCombine(absRootDirPath, "keystore");
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
+    @ReactMethod(isBlockingSynchronousMethod = true) 
     public String backupDisabledDataDir() {
         return this.getNoBackupDirectory();
     }
 
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
+    @ReactMethod(isBlockingSynchronousMethod = true) 
     public String logFileDirectory() {
         return getPublicStorageDirectory().getAbsolutePath();
     }

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -312,11 +312,6 @@ RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)cal
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoStartSearchForLocalPairingPeers();
-    callback(@[result]);
-}
-
 RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
                   callback:(RCTResponseSenderBlock)callback) {
 

nix/DETAILS.md

@@ -23,6 +23,7 @@ There are a few main files that define the whole build environment:
 * [`nix/shells.nix`](./shells.nix) - Definitions of other Nix shells used in builds
 * [`nix/targets.nix`](./targets.nix) - Hierarchy of main build targets
 * [`nix/pkgs.nix`](./pkgs.nix) - Definition of a custom `nixpkgs` repo
+* [`nix/config.nix`](./config.nix) - Default config values for instantiating `nixpkgs`
 * [`nix/overlay.nix`](./overlay.nix) - Overrides for `nixpkgs`, custom packages
 
 The [`default.nix`](../default.nix) and [`shell.nix`](../shell.nix) files at th repo root are just a gateway into the `nix` sub folder.
@@ -74,6 +75,13 @@ nix-build \
   --attr targets.mobile.android.release \
   --argstr secrets-file '/tmp/tmp-status-mobile-559a3a441/tmp.xAnrPuNtAP' \
   --option extra-sandbox-paths '/home/joe/.gradle/status-im.keystore /tmp/tmp-status-mobile-559a3a441/tmp.xAnrPuNtAP' \
+  --arg config '{ \
+    status-im.build-type="nightly";
+    status-im.build-number="2020022418";
+    status-im.android.keystore-path="/home/joe/.gradle/status-im.keystore";
+    status-im.android.abi-split="false";
+    status-im.android.abi-include="armeabi-v7a;arm64-v8a;x86";
+  }' \
   default.nix
 ```
 Some of those are required which is why just calling:

nix/README.md

@@ -8,27 +8,27 @@ The main config file is [`nix/nix.conf`](/nix/nix.conf) and its main purpose is
 
 ## Build arguments
 
-We leverage the environment variables for parameterization of the builds (e.g. to pass a build number or build type).
+We leverage the `config` argument of standard `nixpkgs` for our own parameterization of the builds (e.g. to pass a build number or build type).
 
-Here is the list of variables you can use to override defaults:
-```shell
-# Build type (influences which .env file gets used for feature flags)
-export BUILD_TYPE="pr"
-# Used for versionCode and CFBundleVersion in Android and iOS respectively
-export BUILD_NUMBER=9999
-# Gradle options passed for Android builds
-export ANDROID_GRADLE_OPTS=""
-# If APKs should be split based on architectures
-export ANDROID_ABI_SPLIT=false
-# Android architectures to build for
-export ANDROID_ABI_INCLUDE="x86"
-# Local source override, see below
-export STATUS_GO_SRC_OVERRIDE="$HOME/my/source/status-go"
-export STATUS_GO_IPFS_GATEWAY_URL="https://ipfs.status.im/"
+Here is a sample structure of the `config` attribute set:
+
+```nix
+{
+  status-im = {
+    build-type = "pr";     # Build type (influences which .env file gets used for feature flags)
+    build-number = 9999;   # Used for versionCode and CFBundleVersion in Android and iOS respectively
+    android = {
+      gradle-opts = "";    # Gradle options passed for Android builds
+      abi-split = false;   # If APKs should be split based on architectures
+      abi-include = "x86"; # Android architectures to build for
+    };
+    status-go = {
+      src-override = "$HOME/my/source/status-go"; # local source override
+    };
+  };
+}
 ```
-You can see the defaults in code:
-- [`nix/status-go/default.nix`](./status-go/default.nix)
-- [`nix/mobile/android/release.nix`](./mobile/android/release.nix)
+You can see the defaults in [`nix/config.nix`](./config.nix).
 
 ## Shell
 

nix/config.nix

@@ -0,0 +1,24 @@
+# Status defaults for config
+{
+  status-im = {
+    build-type = "pr";       # Build type (influences which .env file gets used for feature flags)
+    build-number = 9999;     # Used for versionCode and CFBundleVersion in Android and iOS respectively
+    commit-hash = "unknown"; # Included in APK Manifest for easier identification.
+
+    android = {
+      gradle-opts = null;    # Gradle options passed for Android builds
+      apk-signed = true;     # F-Droid builds aren't signed by us
+      abi-split = false;     # If APKs should be split based on architectures
+      abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for
+    };
+
+    status-go = {
+      src-override = null;
+      ipfs-gateway-url = "https://ipfs.status.im/";
+    };
+  };
+
+  # Android SDK requires an accepted license
+  android_sdk.accept_license = true;
+  allowUnfree = true;
+}

nix/deps/clojure/deps.json

@@ -1,4 +1,17 @@
 [
+  {
+    "path": "args4j/args4j/2.0.26/args4j-2.0.26",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "f0aada195340b361a1a45aa9c3d417c7cbb0a6b5",
+      "sha256": "0151vnbmbjnr5089ik8np91r3a4g2ylcahih22zr49a3ilri6f80"
+    },
+    "jar": {
+      "sha1": "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
+      "sha256": "193i0xgn295bdz5gk4zrk4ncfa29x8vl97bfd01kl1za44ixm6wq"
+    }
+  },
+
   {
     "path": "bidi/bidi/2.1.6/bidi-2.1.6",
     "host": "https://repo.clojars.org",
@@ -26,15 +39,15 @@
   },
 
   {
-    "path": "binaryage/oops/0.7.2/oops-0.7.2",
+    "path": "binaryage/oops/0.7.0/oops-0.7.0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "bdce8b7dc9f2b569f5c42a4d6108325899970eb9",
-      "sha256": "1rc4slg4836pnxds447sam9hsiwd4x2al1ykazp6iglc10ix9igd"
+      "sha1": "de223223c4272ce9ee75c81f8764e894029630b4",
+      "sha256": "0sz21344v8lxd6mjlrb8r8yyz934h4lnkwqlpg3csgsi11mppya3"
     },
     "jar": {
-      "sha1": "2f47298f9aa41ef6f2c4f2c49f472eb113e94ae7",
-      "sha256": "0c9f7wylwl0lxcn4vqncprlzmdddqhxzb3vdaawdm0da0xh010hb"
+      "sha1": "9729401b4c6551f6becf44cf0818d04255410099",
+      "sha256": "0jkdybj37q3a4vvay3asj47ms7l3qjpidhkk30293w0zc7jk18k8"
     }
   },
 
@@ -52,28 +65,28 @@
   },
 
   {
-    "path": "cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0",
+    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "d2dd4e969cf44bfffd8609d0d4945a4a561b5a58",
-      "sha256": "0f4yxk0wx1i13inkq9zjd1450bbly5lf62216a88clmn4l5x8knn"
+      "sha1": "3a39a7a1690b4ee6b48a4f0c65d089eacf47e8a5",
+      "sha256": "1qhz6q1afg22j5d8zyxzqsbbinix3zh4lyy2acij8hrp02f274wj"
     },
     "jar": {
-      "sha1": "45f6034b26a14138e74145b7a4059628c0fedcd1",
-      "sha256": "1dy1l6y8cb8xiqq97a4lf8giyiicq4wfl4s2lxn5fb6614cjxqx2"
+      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
+      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
     }
   },
 
   {
-    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
+    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "7e88493d18a4aaf13aff9d0319dcd82178d95f1d",
-      "sha256": "08w5y48bpvnlyqbdjs0h7nz9dp35rc7b46hsvh1a0vpdszisxh0p"
+      "sha1": "c432ffbdd51b67bf82e4a63f1f4f102ba55f4ddf",
+      "sha256": "191wpjlq78s08d509hq2yrxsdzm3qfkqf2zdiwxxlmmh14dg65rx"
     },
     "jar": {
-      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
-      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
+      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
+      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
     }
   },
 
@@ -194,6 +207,162 @@
     }
   },
 
+  {
+    "path": "com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "d04690f71f3393e23f30998d9534365274fa5f9f",
+      "sha256": "1khlag991h7326xsjnpx6hnyip5cwawsmxz6m20kkzavvihsfw21"
+    },
+    "jar": {
+      "sha1": "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
+      "sha256": "1k9zl76xi2nykixaynss2gk4h861zipdb9xl6q1br0ln4hscx1f8"
+    }
+  },
+
+  {
+    "path": "com/google/code/gson/gson/2.7/gson-2.7",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "09f9e39f9b791aeb73ba428ad30872f1a703edb3",
+      "sha256": "1phf2qksjf75ykwgp39189jdbqsn5zrmi07g8h522yxq0zn3cfbj"
+    },
+    "jar": {
+      "sha1": "751f548c85fa49f330cecbb1875893f971b33c4e",
+      "sha256": "0clda1xrjfja969xsbrhc61ip588xvsi9k054kpd4cz1m5gfnhrd"
+    }
+  },
+
+  {
+    "path": "com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "2ccdbc92bc4dfbc9159bf43cf794c240ec37621f",
+      "sha256": "04gmnxv7fpsn66wvmsip4s9hqcc1wphsy3bg13vx262kg9w35j19"
+    },
+    "jar": {
+      "sha1": "7e6e9ec8574d2ff6503f3f774c43695d0276f8f4",
+      "sha256": "1l6g27a361nyl90ln9k2xamjds9xm3kjrfb9xcqz1gqhjgmnml7i"
+    }
+  },
+
+  {
+    "path": "com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "19c878e6870c8382864dcc459de1c6bfe7f36e54",
+      "sha256": "16l1kbc7wbisjmjvkfac854ddyql0b5smdxr2vz8wdms26vydp1y"
+    },
+    "jar": {
+      "sha1": "a6a2b2df72fd13ec466216049b303f206bd66c5d",
+      "sha256": "0831h49f21znl7z8lkr2ikywwajdachgxva7zpj8sp7rl2d9998h"
+    }
+  },
+
+  {
+    "path": "com/google/guava/guava/25.1-jre/guava-25.1-jre",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "5dd13f6c0d56f05059c5eba88a20a8699ece583d",
+      "sha256": "1pya5f4vbh8z9zvprnl64i9qqp0rghjfsflx64q9md28w5pb9y35"
+    },
+    "jar": {
+      "sha1": "6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4",
+      "sha256": "1gqaqxdnxhr1gk9haldrifvda8ingj1s4bin5sf455y38jic7c3d"
+    }
+  },
+
+  {
+    "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "b964a9414771661bdf35a3f10692a2fb0dd2c866",
+      "sha256": "1gnn7b80krv19qjd9hhacahffqq9iwqgmw4ds56wp9wk3rbqrjgh"
+    },
+    "jar": {
+      "sha1": "ed28ded51a8b1c6b112568def5f4b455e6809019",
+      "sha256": "1xpcvmnw2y3fa56hhk8dmknrq8afr6r3kdmzsg9hnwgjg3msg519"
+    }
+  },
+
+  {
+    "path": "com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "703aed7fd9e61298194db257c105b934c5e0cc12",
+      "sha256": "06wpqr4rpj9qz067dn6j54k37lpaqpljrqzamdfb1lrkpygksb29"
+    },
+    "jar": {
+      "sha1": "d5182c2e1bd226e39835c3b97875e27b54ee7401",
+      "sha256": "0f3zgq7k9n1cwm787k2kkyxc9r033h54wlmb60d4nfhd39dbsza3"
+    }
+  },
+
+  {
+    "path": "com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "f1ac30ac5c39c2b6a8b9672373bebb1b5521cffa",
+      "sha256": "0nhxzkdyri03mccxf65lxjxn1fafvhdkqvphf8vkxzkjbgiqwjdm"
+    },
+    "jar": {
+      "sha1": "a017550b64e2690e3a4a5340d1eb699809b9f775",
+      "sha256": "1kpihfzp4x8vxykgd6lcf4nb1r4f5zp3hpivs2793ny019w73rbn"
+    }
+  },
+
+  {
+    "path": "com/google/jsinterop/base/1.0.0/base-1.0.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "9d68520e28ac9b035f86a520692196ea31aaf4f0",
+      "sha256": "0byl8ksnlpvs0nm3a2midrbp6zrgxl7jzqgcz7z1hb1iy3jzfdk1"
+    },
+    "jar": {
+      "sha1": "5d2a5cda3092004832cb67cfe7a100a2ef8411f8",
+      "sha256": "04j4r89vimffmfim0ipmgbd54bxx111c0ygs34dn0krqdb13adk0"
+    }
+  },
+
+  {
+    "path": "com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "718fc66ea5e7ee1597960c5874d4603542814166",
+      "sha256": "0bslwg7rqjanczf3sz11pgdans4hcl4nbp1f5xyy7dzfnkhyhbhx"
+    },
+    "jar": {
+      "sha1": "abd7319f53d018e11108a88f599bd16492448dd2",
+      "sha256": "057hgcrix9ss4cfgkl7pqqlcc7g1xnlx39i8lipn0sjv3xrl9bzw"
+    }
+  },
+
+  {
+    "path": "com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "599529d980b7ca0b4145ae48d4323f3e85e5b1c5",
+      "sha256": "0a0w96psyxpss3y3va5b8hcqzfxxy2kisng9hc6b4im9f83gj56x"
+    },
+    "jar": {
+      "sha1": "1752390841a56e112b01990c9b523e6978abb24f",
+      "sha256": "1wbwasjsqb19xpjk66wyih67492di8sg64qh2n2az7mpfy1dn0aa"
+    }
+  },
+
+  {
+    "path": "com/google/re2j/re2j/1.3/re2j-1.3",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "565024724e6527255f0ae38e507c7f90c55b21ce",
+      "sha256": "0bzj30pnw9bm7jfcwl5ypaqrgvvp3yndf9vdw0qjfyzr9xx39z2d"
+    },
+    "jar": {
+      "sha1": "dc7de2b32fa8cc569ab44fb849abadbbc6983b91",
+      "sha256": "06fypacl4jsbiddgby40fxxz6bpck7jvc5ch344f472cqnhhy16q"
+    }
+  },
+
   {
     "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
     "host": "https://repo1.maven.org/maven2",
@@ -207,19 +376,6 @@
     }
   },
 
-  {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "1f790dd30fd0c2279cf73d79c4eba6a9f7516532",
-      "sha256": "17vb4r6bn97s4jjwja7xmpwfdnfzknhyigz2vdiqpqyh4a31hb3c"
-    },
-    "jar": {
-      "sha1": "14a87750b6bbe6e29932446b6db1f015851fd4e8",
-      "sha256": "11ydn317q2aqh1bkm7gry48r2bakw5ifpx1yrrq192vq5kg7zwhq"
-    }
-  },
-
   {
     "path": "com/ibm/icu/icu4j/66.1/icu4j-66.1",
     "host": "https://repo1.maven.org/maven2",
@@ -233,58 +389,6 @@
     }
   },
 
-  {
-    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
-      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
-    },
-    "jar": {
-      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
-      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
-      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
-    },
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.6/commons-io-2.6",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
-      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
-    },
-    "jar": {
-      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
-      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
-      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
-    },
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
-    }
-  },
-
   {
     "path": "com/taoensso/encore/2.105.0/encore-2.105.0",
     "host": "https://repo.clojars.org",
@@ -363,6 +467,58 @@
     }
   },
 
+  {
+    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
+      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
+    },
+    "jar": {
+      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
+      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
+    },
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.6/commons-io-2.6",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
+      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
+    },
+    "jar": {
+      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
+      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
+      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
+    },
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+    }
+  },
+
   {
     "path": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0",
     "host": "https://repo.clojars.org",
@@ -507,15 +663,15 @@
   },
 
   {
-    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
+    "path": "io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "0c0f3b7a6b2c2b4e73d719362b4595e77fbe98cd",
-      "sha256": "14z0577jgx3r510zgjrzd2vcz9md3d5qpb81ir14zis9vdn5pwxf"
+      "sha1": "28ef70062f9f9442f346d345fb7403d1181c2603",
+      "sha256": "0khc267iljd5b3wlb9rks3zr9blqiz55dky2y0lgx5slxvr5ww95"
     },
     "jar": {
-      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
-      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
+      "sha1": "ea86fcf86ad8d283c5b14a6820061a6bd203839e",
+      "sha256": "00z8d052wp0ba0f64ki08867d7hsx3w1zrhngpbm45qcqs2hphai"
     }
   },
 
@@ -585,15 +741,28 @@
   },
 
   {
-    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
+    "path": "nrepl/nrepl/0.7.0/nrepl-0.7.0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "79b3e7030f2da9c4b8a20e4e5b44b401fbaccefc",
-      "sha256": "0wnsyd2vwikqljl8si3040s5b89fm8j9zfa4a1c8g3lzj4npjwvl"
+      "sha1": "913a846875363d8255bcede71d1186082f0f05d5",
+      "sha256": "1f1ii5k975fmlcqj6dydc28mzbpiyyq9hqzv9lnzm9n15fgggafa"
     },
     "jar": {
-      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
-      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
+      "sha1": "55dabf4f271d30e7a8f0e198055c000398991e14",
+      "sha256": "1h9zin2z4ll3jfr0cqp7zfvy6d2axrjjnyv8qbir0krjsss13ikw"
+    }
+  },
+
+  {
+    "path": "org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "17ab37f0fb0338647a70ab40f15c2c685e4185e3",
+      "sha256": "0s0062lnqk8vq23dil7qma7rl5x1h16h2x4bah7fw6rbvm9h7cfy"
+    },
+    "jar": {
+      "sha1": "518929596ee3249127502a8573b2e008e2d51ed3",
+      "sha256": "15br88i0dk5l0hdh6ikgg6kvdbdir38jdw69j9s579az5xil317w"
     }
   },
 
@@ -611,15 +780,15 @@
   },
 
   {
-    "path": "org/clojure/clojurescript/1.10.844/clojurescript-1.10.844",
+    "path": "org/clojure/clojurescript/1.10.773/clojurescript-1.10.773",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "f4004d2de394c5f41317a38ae32f79e78826b45f",
-      "sha256": "0nq8mz45gl86aigrmjnkq2fd612caayxfzkyk03dmp5v4sr5zxf6"
+      "sha1": "ae4301ccf5a38dad594760b1c08774fc471fd59c",
+      "sha256": "15vfzdq8vx9slppvkyvgvzndnrgqrc5m2vl0969lnprwizmrv570"
     },
     "jar": {
-      "sha1": "86bedf67c795c72bde3feb0415b41be8b95f2cbb",
-      "sha256": "03rs4dpwssa5ym9idip6vkxq27np3dwx7mzxms2s0yv4lipla58v"
+      "sha1": "9f9729dbbf9b814c83dc189977b447d2ae92b6cd",
+      "sha256": "1r0b6241ci1jwh6dk2yqb2ylh4aj4f2df5xxzwx3qp33xlday11z"
     }
   },
 
@@ -715,28 +884,28 @@
   },
 
   {
-    "path": "org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d",
+    "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "9fbaa40e54d12d1d35afee260600b8e7325034cc",
-      "sha256": "046qdcbqclxz0p4lnahglqkazraw47gymx3cin5jrw2wd7dpmr0l"
+      "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188",
+      "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1"
     },
     "jar": {
-      "sha1": "b8c673dd84d8ed85c6d857e28afee5524a0ef82c",
-      "sha256": "0q84zw1nl0sg69cx9i7g2bkw7996ig2j3m9pw4yfysjsn5aycm1q"
+      "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a",
+      "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5"
     }
   },
 
   {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d",
+    "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "93650c3e00cf1dc0811d2e347068828cf6700fca",
-      "sha256": "1y6a10n8w98gr02ys8zxkddq2qrz7l5y3462d4hg8jpaq3r2pdm8"
+      "sha1": "dea94d117aa88d75e281f877914454f79df06bf2",
+      "sha256": "1nysls9ywj3b3zvlfwy68kayx47r4bacidmq1vx8w4h043l9kxrr"
     },
     "jar": {
-      "sha1": "edcb415db3c88ada448cfbf65b021f12c7b131e9",
-      "sha256": "1f5hjr2r323il0g9maamwdbgqxrvm3hg87jsgc13wa7naw4pm9pi"
+      "sha1": "6025affb7181cd40418600864f58eed1ea80055d",
+      "sha256": "0w6waii2qps7vp3nzbj5nai809xdq26ss0cabl4wz1s8fc6js6qw"
     }
   },
 
@@ -766,19 +935,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "fa72b6392b31762b55e0dc3de1c220ecdc6bb8a7",
-      "sha256": "1yg46a9zbga7rsrhwdv877hh60hcbyaykn37r3i50icxmgqcylq4"
-    },
-    "jar": {
-      "sha1": "d2fb65426c7998647fb1fb3db1fb5b222ab91df6",
-      "sha256": "0mj1xi3v03fzcw1smpayvbvbgly2p3ysbgfz7jgfdhmxi4gl6gs6"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -792,6 +948,19 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "fa72b6392b31762b55e0dc3de1c220ecdc6bb8a7",
+      "sha256": "1yg46a9zbga7rsrhwdv877hh60hcbyaykn37r3i50icxmgqcylq4"
+    },
+    "jar": {
+      "sha1": "d2fb65426c7998647fb1fb3db1fb5b222ab91df6",
+      "sha256": "0mj1xi3v03fzcw1smpayvbvbgly2p3ysbgfz7jgfdhmxi4gl6gs6"
+    }
+  },
+
   {
     "path": "org/clojure/tools.cli/1.0.194/tools.cli-1.0.194",
     "host": "https://repo1.maven.org/maven2",
@@ -845,15 +1014,15 @@
   },
 
   {
-    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
+    "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
-      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
+      "sha1": "99a56e3312f8ece1d457c8ca0a3c4b69d173d000",
+      "sha256": "09ianw2880ch3x6xq5d2cz2b15ik6f4ndf8hb7ckw7lr0ndg2y8q"
     },
     "jar": {
-      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
-      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
+      "sha1": "775b7e22fb10026eed3f86e8dc556dfafe35f2d5",
+      "sha256": "0pchd4360mim0f0a6vwr33szigihgvv4ic1scz1l9mxssq5k4s10"
     }
   },
 
@@ -870,6 +1039,19 @@
     }
   },
 
+  {
+    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
+      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
+    },
+    "jar": {
+      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
+      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
+    }
+  },
+
   {
     "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -1000,19 +1182,6 @@
     }
   },
 
-  {
-    "path": "org/ow2/asm/asm/7.1/asm-7.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
-      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
-    },
-    "jar": {
-      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
-      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
-    }
-  },
-
   {
     "path": "org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1",
     "host": "https://repo1.maven.org/maven2",
@@ -1065,6 +1234,19 @@
     }
   },
 
+  {
+    "path": "org/ow2/asm/asm/7.1/asm-7.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
+      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
+    },
+    "jar": {
+      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
+      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
+    }
+  },
+
   {
     "path": "org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final",
     "host": "https://repo1.maven.org/maven2",
@@ -1117,19 +1299,6 @@
     }
   },
 
-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
-      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
-    },
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
   {
     "path": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -1143,19 +1312,6 @@
     }
   },
 
-  {
-    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "699468e940eace1064d6fa7a7553bf87d4ed4026",
-      "sha256": "12djd3mxi22b23c9vrv6amq1r9x9iq9b00s3ywl301rjmq5lqh4l"
-    },
-    "jar": {
-      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
-      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
-    }
-  },
-
   {
     "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
     "host": "https://repo.clojars.org",
@@ -1195,6 +1351,32 @@
     }
   },
 
+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
+      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
+    },
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
+  {
+    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "0bce30b420249ba7e4b90cbb3e046b4bb5416389",
+      "sha256": "0zmg5qc8d55pry7832isiwd2q237znfjqjpxchd2hvlpalh5qnva"
+    },
+    "jar": {
+      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
+      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+    }
+  },
+
   {
     "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
     "host": "https://repo.clojars.org",
@@ -1274,15 +1456,15 @@
   },
 
   {
-    "path": "thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot",
+    "path": "thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "e89cabf1b6c7d268ee38343c839bc17c62160eaf",
-      "sha256": "0l9yv2c6acp3n2x5z1g9nqwqx58hl619srls5flnlf2x41f5gn7f"
+      "sha1": "c06750fa2103c3ade8e9580034401d7379558768",
+      "sha256": "09m0yl56b2ld1a9031x6x3wlzys608hfzdf87hrnmpihg8khq5ph"
     },
     "jar": {
-      "sha1": "4748679d4953be302acf7e791b284a8dc49523d7",
-      "sha256": "1gcbna7wam7fnhrxxfb4v3agq0655la2fmwd7r9a6ip9xxc86z3a"
+      "sha1": "6da05fd411b96fa939fa4df19aa28c0a37b0a87d",
+      "sha256": "1w6xm7bfg216cygmc4skns2laip3b7vp8nvgqmylpgna1k21mps2"
     }
   },
 
@@ -1299,19 +1481,6 @@
     }
   },
 
-  {
-    "path": "thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "456dc9b20bccd14b6012540547d1a8e7c47f7c66",
-      "sha256": "0gwxvbpkfvy84h01gjasd0fnfgqmsaybiilbz0461vaazvcd3v8b"
-    },
-    "jar": {
-      "sha1": "e072ad66285641c59df19f5352872a51da106156",
-      "sha256": "1ywcyfsrr3g42kxwchj6jvb2x43md3sdpnnk87h9m5g786ilay3r"
-    }
-  },
-
   {
     "path": "thheller/shadow-util/0.7.0/shadow-util-0.7.0",
     "host": "https://repo.clojars.org",

nix/deps/clojure/deps.list

@@ -1,9 +1,10 @@
+args4j/args4j/2.0.26/args4j-2.0.26.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
 binaryage/env-config/0.2.2/env-config-0.2.2.jar
-binaryage/oops/0.7.2/oops-0.7.2.jar
+binaryage/oops/0.7.0/oops-0.7.0.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
-cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
-cider/piggieback/0.5.2/piggieback-0.5.2.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
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
@@ -13,19 +14,30 @@ com/cognitect/transit-cljs/0.8.248/transit-cljs-0.8.248.jar
 com/cognitect/transit-java/1.0.343/transit-java-1.0.343.jar
 com/cognitect/transit-js/0.8.846/transit-js-0.8.846.jar
 com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7.jar
+com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar
+com/google/code/gson/gson/2.7/gson-2.7.jar
+com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1.jar
+com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.jar
+com/google/guava/guava/25.1-jre/guava-25.1-jre.jar
+com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
+com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830.jar
+com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830.jar
+com/google/jsinterop/base/1.0.0/base-1.0.0.jar
+com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2.jar
+com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1.jar
+com/google/re2j/re2j/1.3/re2j-1.3.jar
 com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
-com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302.jar
 com/ibm/icu/icu4j/66.1/icu4j-66.1.jar
-commons-codec/commons-codec/1.10/commons-codec-1.10.jar
-commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.6/commons-io-2.6.jar
-compojure/compojure/1.5.2/compojure-1.5.2.jar
 com/taoensso/encore/2.105.0/encore-2.105.0.jar
 com/taoensso/timbre/4.10.0/timbre-4.10.0.jar
 com/taoensso/truss/1.5.0/truss-1.5.0.jar
 com/taoensso/tufte/2.1.0/tufte-2.1.0.jar
 com/wsscode/pathom/2.2.31/pathom-2.2.31.jar
 com/wsscode/spec-inspec/1.0.0-alpha2/spec-inspec-1.0.0-alpha2.jar
+commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
+commons-io/commons-io/2.6/commons-io-2.6.jar
+compojure/compojure/1.5.2/compojure-1.5.2.jar
 crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar
 crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
@@ -37,15 +49,16 @@ hickory/hickory/0.7.1/hickory-0.7.1.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/0.1.33/pretty-0.1.33.jar
-io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
+io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
 mvxcvi/alphabase/1.0.0/alphabase-1.0.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
-nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
+nrepl/nrepl/0.7.0/nrepl-0.7.0.jar
+org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0.jar
 org/clojure/clojure/1.10.1/clojure-1.10.1.jar
-org/clojure/clojurescript/1.10.844/clojurescript-1.10.844.jar
+org/clojure/clojurescript/1.10.773/clojurescript-1.10.773.jar
 org/clojure/core.async/1.3.610/core.async-1.3.610.jar
 org/clojure/core.cache/1.0.207/core.cache-1.0.207.jar
 org/clojure/core.memoize/1.0.236/core.memoize-1.0.236.jar
@@ -53,18 +66,19 @@ org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1.jar
 org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar
 org/clojure/data.json/1.0.0/data.json-1.0.0.jar
 org/clojure/data.priority-map/1.0.0/data.priority-map-1.0.0.jar
-org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d.jar
-org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d.jar
+org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.jar
+org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f.jar
 org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar
 org/clojure/test.check/1.1.0/test.check-1.1.0.jar
-org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.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.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
-org/graalvm/js/js/20.1.0/js-20.1.0.jar
+org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
 org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar
+org/graalvm/js/js/20.1.0/js-20.1.0.jar
 org/graalvm/regex/regex/20.1.0/regex-20.1.0.jar
 org/graalvm/sdk/graal-sdk/20.1.0/graal-sdk-20.1.0.jar
 org/graalvm/truffle/truffle-api/20.1.0/truffle-api-20.1.0.jar
@@ -75,29 +89,28 @@ org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
 org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
 org/jsoup/jsoup/1.9.2/jsoup-1.9.2.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
-org/ow2/asm/asm/7.1/asm-7.1.jar
 org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar
 org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar
 org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar
 org/ow2/asm/asm-util/7.1/asm-util-7.1.jar
+org/ow2/asm/asm/7.1/asm-7.1.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
 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
-reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.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
+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
 ring/ring-core/1.8.1/ring-core-1.8.1.jar
 spec-coerce/spec-coerce/1.0.0-alpha6/spec-coerce-1.0.0-alpha6.jar
 status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot.jar
+thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot.jar
 thheller/shadow-cljsjs/0.0.21/shadow-cljsjs-0.0.21.jar
-thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1.jar

nix/deps/gradle/deps.json

@@ -9492,16 +9492,16 @@
   },
 
   {
-    "path": "com/google/auto/value/auto-value-annotations/1.10.2",
+    "path": "com/google/auto/value/auto-value-annotations/1.10.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "auto-value-annotations-1.10.2.pom": {
-        "sha1": "bdae7d62039b58f8e6099403bd8d663064e00805",
-        "sha256": "sha256-ck+V7NRFowDEx39LIHU+xe2rcLmth1Hez3CcgWUKdyE="
+      "auto-value-annotations-1.10.1.pom": {
+        "sha1": "72aa2e866fd52dc58222aacc490b6f469ff8a50f",
+        "sha256": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc="
       },
-      "auto-value-annotations-1.10.2.jar": {
-        "sha1": "337954851fc17058d9b4b692b6e67e57b20e14f0",
-        "sha256": "sha256-Pzt+369/u9iGQve9WwlIe43PK55fOhnx63s+U/IPFLo="
+      "auto-value-annotations-1.10.1.jar": {
+        "sha1": "9e5162c15f6033c524134cba05a5e93dc1d37c4b",
+        "sha256": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I="
       }
     }
   },
@@ -9529,12 +9529,12 @@
   },
 
   {
-    "path": "com/google/auto/value/auto-value-parent/1.10.2",
+    "path": "com/google/auto/value/auto-value-parent/1.10.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "auto-value-parent-1.10.2.pom": {
-        "sha1": "8828fce3eb0708d36059af557545ab9b0c5a82de",
-        "sha256": "sha256-kdaz5RX4jKobwFyqsbvciU/27dY1Se8PCaVYTJeT7mk="
+      "auto-value-parent-1.10.1.pom": {
+        "sha1": "cfd31b18489357b9f2b0acee57d6674394575c37",
+        "sha256": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k="
       }
     }
   },
@@ -10186,27 +10186,27 @@
   },
 
   {
-    "path": "com/google/guava/guava-parent/32.1.1-jre",
+    "path": "com/google/guava/guava-parent/32.0.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-parent-32.1.1-jre.pom": {
-        "sha1": "01c4a3f0686592f40c1052b273c9b533f6a71e6d",
-        "sha256": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0="
+      "guava-parent-32.0.1-jre.pom": {
+        "sha1": "88c9e60e238868208ca8e375a475a23142e52ac6",
+        "sha256": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo="
       }
     }
   },
 
   {
-    "path": "com/google/guava/guava-testlib/32.1.1-jre",
+    "path": "com/google/guava/guava-testlib/32.0.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-testlib-32.1.1-jre.pom": {
-        "sha1": "db7f2a81be1c208ea156572f3e344b6e47b4402f",
-        "sha256": "sha256-8vbywCb/80CvDqzmn1SHRUG62UPLj8nvh7rm0z5yT1w="
+      "guava-testlib-32.0.1-jre.pom": {
+        "sha1": "a15680d2a8dd88549afda6094b5dc79ec008a5bb",
+        "sha256": "sha256-kPF5mSKi2TRJl+1qpiD6HnzEJuOleB9/ufksEPWFAhs="
       },
-      "guava-testlib-32.1.1-jre.jar": {
-        "sha1": "7cf13628fd8fedd5c612b928858912d9d6573d28",
-        "sha256": "sha256-d+b5cAvGPxiz2iTScB9BucnhzEpXNG8hztZssAZtojU="
+      "guava-testlib-32.0.1-jre.jar": {
+        "sha1": "53ebb9303be258ba8fda12881f04be811e0f496e",
+        "sha256": "sha256-yXURhJpeCFKA8QbfKwWVZv69KAsRjTPWqeBo0jgQC2M="
       }
     }
   },
@@ -10377,16 +10377,16 @@
   },
 
   {
-    "path": "com/google/guava/guava/32.1.1-jre",
+    "path": "com/google/guava/guava/32.0.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-32.1.1-jre.pom": {
-        "sha1": "0e5cbc6d9046ce986b121a842f8d30ee6d81a900",
-        "sha256": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs="
+      "guava-32.0.1-jre.pom": {
+        "sha1": "4b29ff9dfc268252e73839b0f7324ef705e07108",
+        "sha256": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo="
       },
-      "guava-32.1.1-jre.jar": {
-        "sha1": "ad575652d84153075dd41ec6177ccb15251262b2",
-        "sha256": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE="
+      "guava-32.0.1-jre.jar": {
+        "sha1": "6e5d51a72d142f2d40a57dfb897188b36a95b489",
+        "sha256": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU="
       }
     }
   },
@@ -11044,16 +11044,16 @@
   },
 
   {
-    "path": "com/squareup/okio/okio-jvm/3.4.0",
+    "path": "com/squareup/okio/okio-jvm/3.3.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "okio-jvm-3.4.0.pom": {
-        "sha1": "5863f748d245d922f99b22c24e3d0c00455f6687",
-        "sha256": "sha256-ZqiFeYHqbD7IuGE6QJvxLxR5Ze+UmMt6jzcXKMTi2k0="
+      "okio-jvm-3.3.0.pom": {
+        "sha1": "441db5e3f85f26d8891b7ae05cffb9a1a67ee54f",
+        "sha256": "sha256-RgAOC5D+UbfbTA6YseP5IxVWJqh7vD9N3ItWwNM3GM4="
       },
-      "okio-jvm-3.4.0.jar": {
-        "sha1": "4e8bd78a52ab935ce383d0092646922154295e54",
-        "sha256": "sha256-ATnselBtu9VMrWIpGwGcuFBTS+CXyMZsEADV++jt7z4="
+      "okio-jvm-3.3.0.jar": {
+        "sha1": "2d175add2d06a67bda111ae5455e49b42d0bb287",
+        "sha256": "sha256-3/qEF+wg19Rrx0xq16QiazjaJYipdU9imGJPBN8jciI="
       }
     }
   },
@@ -11115,16 +11115,16 @@
   },
 
   {
-    "path": "com/squareup/okio/okio/3.4.0",
+    "path": "com/squareup/okio/okio/3.3.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "okio-3.4.0.pom": {
-        "sha1": "10df463795f884e8f616849ef57229603f116f80",
-        "sha256": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM="
+      "okio-3.3.0.pom": {
+        "sha1": "8b5abd4bc3965b81e4c8c718bfabdac9afbebe7b",
+        "sha256": "sha256-1aiEoZkyN9rnxa9t5C+vkxzzO9pwLm2qmdOrCKi8xZ8="
       },
-      "okio-3.4.0.jar": {
-        "sha1": "cdbfd045ea8fb402b78e3b3a1177ce6f19d8b2f3",
-        "sha256": "sha256-GHgMXSKb0AiVzyi5E8Wh5YXb8Kq49BD8SDkuF4OrtEI="
+      "okio-3.3.0.jar": {
+        "sha1": "c3ad4568143c88518e82eb63de30e2d3de011439",
+        "sha256": "sha256-DyFSCU7lcwFZ4Yu6aZBdAk6cep9Ij2AhGh3Sg3N/q8U="
       }
     }
   },
@@ -14254,16 +14254,16 @@
   },
 
   {
-    "path": "org/checkerframework/checker-qual/3.36.0",
+    "path": "org/checkerframework/checker-qual/3.35.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "checker-qual-3.36.0.pom": {
-        "sha1": "6718527e5d8619731637618c68b4d49aa1649c0d",
-        "sha256": "sha256-kLwP0YLqKfP2kkuLYmzMaqTmSm1Apw7klU1j4gb/zvQ="
+      "checker-qual-3.35.0.pom": {
+        "sha1": "5211a7196b70c37b573e3405d14661cd82e1eddb",
+        "sha256": "sha256-CzlY7JehFV7QAHwXbMICwUrdZm1PV1gPuhzpy2mb+KM="
       },
-      "checker-qual-3.36.0.jar": {
-        "sha1": "62ea2b911acf3a3eecd25a1a2986864b7403f6d2",
-        "sha256": "sha256-uj7BaeB28uXYLfpRQubunxbnayvvMMrc5FV+1fq3gu0="
+      "checker-qual-3.35.0.jar": {
+        "sha1": "3baabaf8eecea6e9e22b8e39cd25953ff4813e0e",
+        "sha256": "sha256-IQYPqght/eyDCkD5RgZ3p1673P/nzcASrRBp6cwwqVk="
       }
     }
   },
@@ -15875,16 +15875,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/1.9.0",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/1.9.0-RC",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-reflect-1.9.0.pom": {
-        "sha1": "eb198069ed7e9e8458d900c47325475ec581507a",
-        "sha256": "sha256-hXFWVnbRiXIEcTBs7ppV2RbAgDgvNabaaBk6x7EvTNs="
+      "kotlin-reflect-1.9.0-RC.pom": {
+        "sha1": "3a1dca889c37677ab1031646e99190406b48b60d",
+        "sha256": "sha256-AaWDwwugU0BM/4qe7iGCL2kBfXUCbOXqzFCXjKcBuiA="
       },
-      "kotlin-reflect-1.9.0.jar": {
-        "sha1": "2891f552979d4bf4d4ec516acb9df769fb62dbe9",
-        "sha256": "sha256-IHAVm+UU6o6jziyLHueZPm/2CpNWWimfIAYpqn339YE="
+      "kotlin-reflect-1.9.0-RC.jar": {
+        "sha1": "2a7a69e82364a9e6f26b8d7053c0e4f1095693e5",
+        "sha256": "sha256-RCoElBkwb/CgCVHMmCTorhyB1HWKo/v5ineCxM68O/c="
       }
     }
   },
@@ -16325,16 +16325,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0-RC",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-stdlib-common-1.9.0.pom": {
-        "sha1": "0a865a0c5a64618fd1dcca13d05dea4cba44c832",
-        "sha256": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU="
+      "kotlin-stdlib-common-1.9.0-RC.pom": {
+        "sha1": "1eee188e6e339347cb905505ba0884504b7d271c",
+        "sha256": "sha256-jybwbbD1aQ6epaWjeA9hyEAVaRnYpXqOGvnt8cvQjD0="
       },
-      "kotlin-stdlib-common-1.9.0.jar": {
-        "sha1": "cd65c21cfd1eec4d44ef09f9f52b6d9f8a720636",
-        "sha256": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw="
+      "kotlin-stdlib-common-1.9.0-RC.jar": {
+        "sha1": "0d9bdb03665199f3548ff91464625d943f816594",
+        "sha256": "sha256-2nsa2F4a/WQ9riwPDVFaUTZiW839GD7YbFeVrhfgWpk="
       }
     }
   },
@@ -17030,16 +17030,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.0",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.0-RC",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-stdlib-1.9.0.pom": {
-        "sha1": "4aea0493dfd3ee18df73bcd97db791c2ea5bb383",
-        "sha256": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso="
+      "kotlin-stdlib-1.9.0-RC.pom": {
+        "sha1": "9b8fee0f61426896867f6bbeff6cd80c5e364789",
+        "sha256": "sha256-Ljsx4IQ1ngB2u5q9jpoBUDQ8wdLA81Zx4gKhy1Rqp6A="
       },
-      "kotlin-stdlib-1.9.0.jar": {
-        "sha1": "8ee15ef0c67dc83d874f412d84378d7f0eb50b63",
-        "sha256": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4="
+      "kotlin-stdlib-1.9.0-RC.jar": {
+        "sha1": "f42325be451f7f28ec68e1e60227035beae7ca9b",
+        "sha256": "sha256-x+O9exwYsJnuUeNXIOxgSndh2fpFEmlkQgQOPb9X0Oo="
       }
     }
   },
@@ -17232,12 +17232,12 @@
   },
 
   {
-    "path": "org/junit/junit-bom/5.10.0",
+    "path": "org/junit/junit-bom/5.10.0-M1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "junit-bom-5.10.0.pom": {
-        "sha1": "1136f35a5438634393bf628f69b8ca43c8518f7c",
-        "sha256": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+      "junit-bom-5.10.0-M1.pom": {
+        "sha1": "32146a4e02dff4367f085571d9157924622888a2",
+        "sha256": "sha256-2ltnOOp1EcGyT/z0h2UMPcB1aihjLktKfA2qbiTt7O0="
       }
     }
   },

nix/deps/gradle/deps.urls

@@ -634,10 +634,10 @@ https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6
 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/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.10.2/auto-value-annotations-1.10.2.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.1/auto-value-annotations-1.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.3/auto-value-parent-1.6.3.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.2/auto-value-parent-1.10.2.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.1/auto-value-parent-1.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.pom
@@ -688,8 +688,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/29.0-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-android/guava-parent-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guava-parent-30.1-jre.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/32.1.1-jre/guava-parent-32.1.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.1.1-jre/guava-testlib-32.1.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/32.0.1-jre/guava-parent-32.0.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-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
@@ -701,7 +701,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/29.0-jre/guava-29.0-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-android/guava-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.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/32.1.1-jre/guava-32.1.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-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
@@ -750,12 +750,12 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.pom
 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.4.0/okio-jvm-3.4.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.3.0/okio-jvm-3.3.0.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.4.0/okio-3.4.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.3.0/okio-3.3.0.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
@@ -988,7 +988,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.36.0/checker-qual-3.36.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.35.0/checker-qual-3.35.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.10/groovy-xml-3.0.10.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.pom
@@ -1103,7 +1103,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.pom
 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.9.0/kotlin-reflect-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.9.0-RC/kotlin-reflect-1.9.0-RC.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.10/kotlin-scripting-common-1.6.10.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-compiler-embeddable/1.6.10/kotlin-scripting-compiler-embeddable-1.6.10.pom
@@ -1133,7 +1133,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.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.8.0/kotlin-stdlib-common-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0-RC/kotlin-stdlib-common-1.9.0-RC.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
@@ -1180,7 +1180,7 @@ 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.8.0/kotlin-stdlib-1.8.0.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.0-RC/kotlin-stdlib-1.9.0-RC.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.10/kotlin-tooling-metadata-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.10/kotlin-util-io-1.6.10.pom
@@ -1194,7 +1194,7 @@ https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20230618/json-20230618.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/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0-M1/junit-bom-5.10.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

nix/lib/default.nix

@@ -1,9 +1,8 @@
-{ lib }:
+{ lib, config }:
 
 {
-  getEnvWithDefault = import ./getEnvWithDefault.nix;
+  getConfig = import ./getConfig.nix { inherit lib config; };
   mkFilter = import ./mkFilter.nix { inherit lib; };
   mergeSh = import ./mergeSh.nix { inherit lib; };
   checkEnvVarSet = import ./checkEnvVarSet.nix;
-  sanitizeVersion = import ./sanitizeVersion.nix { inherit lib; };
 }

nix/lib/getConfig.nix

@@ -0,0 +1,11 @@
+# helper for getting status-im config values in a safe way
+#
+
+{ lib, config }:
+
+let inherit (lib) splitString attrByPath;
+in name: default:
+let
+  path = [ "status-im" ] ++ (splitString "." name);
+  value = attrByPath path default config;
+in if value != null then value else default

nix/lib/getEnvWithDefault.nix

@@ -1,8 +0,0 @@
-name: default: let
-  envOverride = builtins.getEnv name;
-  logEnvOverride = value:
-    builtins.trace "getEnvWithDefault ${name} (default: ${toString default}): ${value}" value;
-in
-  if envOverride != ""
-  then logEnvOverride envOverride
-  else default

nix/lib/sanitizeVersion.nix

@@ -1,14 +0,0 @@
-{ lib }:
-
-version:
-let
-  # paths don't like slashes in them
-  dropSlashes = builtins.replaceStrings [ "/" ] [ "_" ];
-  # if version doesn't match this it's probably a commit, it's lax semver
-  versionRegex = "^v?[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+[[:alnum:]+_.-]*$";
-in
-  if (builtins.match versionRegex version) != null
-  # Geth forces a 'v' prefix for all versions
-  then lib.removePrefix "v" (dropSlashes version)
-  # reduce metrics cardinality in Prometheus
-  else lib.traceValFn (_: "WARNING: Marking build version as 'develop'!") "develop"

nix/mobile/android/default.nix

@@ -15,11 +15,19 @@ rec {
     ];
 
     inputsFrom = [
-      (release {})
+      release
       androidShell
     ];
 
     shellHook = ''
+      export ANDROID_SDK_ROOT="${androidPkgs.sdk}"
+      export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
+
+      export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
+
+      # required by some makefile targets
+      export STATUS_GO_ANDROID_LIBDIR=${status-go}
+
       # check if node modules changed and if so install them
       $STATUS_MOBILE_HOME/nix/scripts/node_modules.sh ${deps.nodejs-patched}
     '';

nix/mobile/android/release.nix

@@ -6,33 +6,20 @@
   buildEnv ? "prod",
   # Path to the file containing secret environment variables
   secretsFile ? "",
-  # Build type (influences which .env file gets used for feature flags)
-  # TODO: pr or relase for default?
-  buildType ? lib.getEnvWithDefault "BUILD_TYPE" "release",
-  # Used for versionCode
-  buildNumber ? lib.getEnvWithDefault "BUILD_NUMBER" 9999,
-  # Included in APK Manifest for easier identification.
-  # TODO: or GIT_COMMIT from Jenkins?
-  commitHash ? lib.getEnvWithDefault "COMMIT_HASH" "unknown",
-  # Gradle options passed for Android builds
-  androidGradleOpts ? lib.getEnvWithDefault "ANDROID_GRADLE_OPTS" null,
-  statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
-  # If APKs should be split based on architectures
-  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
-  # Android architectures to build for
-  # Used to detect end-to-end builds
-  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
 }:
 
 let
-  inherit (lib) toLower optionalString stringLength makeLibraryPath elem;
+  inherit (lib) toLower optionalString stringLength getConfig makeLibraryPath elem;
 
   # Pass secretsFile for POKT_TOKEN to jsbundle build
   builtJsBundle = jsbundle { inherit secretsFile; };
 
-  # Map ANDROID_ABI_INCLUDE to status-go targets
-  androidAbiIncludeSplit = lib.splitString ";" androidAbiInclude;
-
+  buildType = getConfig "build-type" "release";
+  buildNumber = getConfig "build-number" 9999;
+  commitHash = getConfig "commit-hash" "unknown";
+  gradleOpts = getConfig "android.gradle-opts" null;
+  # Used to detect end-to-end builds
+  androidAbiInclude = getConfig "android.abi-include" "armeabi-v7a;arm64-v8a;x86";
 
   envFileName =
     if androidAbiInclude == "x86"                  then ".env.e2e"
@@ -76,29 +63,25 @@ in stdenv.mkDerivation rec {
   # Used by Clojure at compile time to include JS modules
   BUILD_ENV = buildEnv;
 
-  STATUS_GO_SRC_OVERRIDE = statusGoSrcOverride;
-  ANDROID_ABI_SPLIT = androidAbiSplit;
+  # custom env variables derived from config
+  STATUS_GO_SRC_OVERRIDE = getConfig "status-go.src-override" null;
+  ANDROID_ABI_SPLIT = getConfig "android.abi-split" "false";
   ANDROID_ABI_INCLUDE = androidAbiInclude;
 
+  # Android SDK/NDK for use by Gradle
+  ANDROID_SDK_ROOT = "${androidPkgs.sdk}";
+  ANDROID_NDK_ROOT = "${androidPkgs.ndk}";
+
   # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
   NODE_OPTIONS = "--openssl-legacy-provider";
 
+  # Used by the Android Gradle build script in android/build.gradle
+  STATUS_GO_ANDROID_LIBDIR = status-go;
+
   phases = [
-    "shellHook" "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
+    "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
   ];
 
-  # We use shellHook as a single place to setup env vars for both build derivation and shell
-  shellHook = ''
-    # Used by the Android Gradle build script in android/build.gradle
-    export STATUS_GO_ANDROID_LIBDIR=${ status-go { abis = androidAbiIncludeSplit; } }
-
-    # Android SDK/NDK for use by Gradle
-    export ANDROID_SDK_ROOT="${androidPkgs.sdk}"
-    export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
-
-    export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
-  '';
-
   unpackPhase = ''
     cp -ar $src/. ./
     chmod u+w -R ./
@@ -139,9 +122,17 @@ in stdenv.mkDerivation rec {
   buildPhase = let
     adhocEnvVars = optionalString stdenv.isLinux
       "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${makeLibraryPath [ pkgs.zlib ]}";
-    gradleCommand = ''
-      ${pkgs.gradle}/bin/gradle \
-      ${toString androidGradleOpts} \
+  in
+    assert ANDROID_ABI_SPLIT != null && ANDROID_ABI_SPLIT != "";
+    assert stringLength ANDROID_ABI_INCLUDE > 0;
+  ''
+    # Fixes issue with failing to load libnative-platform.so
+    export GRADLE_USER_HOME=$(mktemp -d)
+    export ANDROID_SDK_HOME=$(mktemp -d)
+
+    pushd ./android
+    ${adhocEnvVars} ${pkgs.gradle}/bin/gradle \
+      ${toString gradleOpts} \
       --console=plain \
       --offline \
       --no-daemon \
@@ -151,21 +142,8 @@ in stdenv.mkDerivation rec {
       -Dmaven.repo.local='${deps.gradle}' \
       -PversionCode=${toString buildNumber} \
       -PcommitHash=${commitHash} \
-      assemble${gradleBuildType}
-    '';
-  in
-    assert ANDROID_ABI_SPLIT != null && ANDROID_ABI_SPLIT != "";
-    assert stringLength ANDROID_ABI_INCLUDE > 0;
-  ''
-    # Fixes issue with failing to load libnative-platform.so
-    export GRADLE_USER_HOME=$(mktemp -d)
-    export ANDROID_SDK_HOME=$(mktemp -d)
-
-    echo "Adhoc ENV: ${adhocEnvVars}"
-    echo "Running: ${gradleCommand}"
-
-    pushd ./android
-    ${adhocEnvVars} ${gradleCommand}
+      assemble${gradleBuildType} \
+      || exit 1
     popd > /dev/null
   '';
   doCheck = true;

nix/overlay.nix

@@ -13,8 +13,11 @@ in {
   # Fix for MacOS
   mkShell = super.mkShell.override { stdenv = stdenvNoCC; };
 
+  # Various utilities
+  utils = callPackage ./tools/utils.nix { };
   lib = (super.lib or { }) // (import ./lib {
     inherit (super) lib;
+    inherit (self) config;
   });
 
   # Project dependencies
@@ -26,6 +29,9 @@ in {
     react-native = callPackage ./deps/react-native { };
   };
 
+  # For parsing gradle.properties into an attrset
+  gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
+
   # Fix for missing libarclite_macosx.a in Xcode 14.3.
   # https://github.com/ios-control/ios-deploy/issues/580
   ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {

nix/pkgs.nix

@@ -13,10 +13,7 @@ let
   };
 
   # Status specific configuration defaults
-  defaultConfig = {
-    android_sdk.accept_license = true;
-    allowUnfree = true;
-  };
+  defaultConfig = import ./config.nix;
 
   # Override some packages and utilities
   pkgsOverlay = import ./overlay.nix;

nix/scripts/shell.sh

@@ -41,6 +41,16 @@ nixArgs=(
     "--attr shells.${TARGET}"
 )
 
+config=''
+if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
+    config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
+fi
+config+="status-im.build-type=\"${BUILD_TYPE}\";"
+
+if [[ -n "$config" ]]; then
+    nixArgs+=("--arg config {$config}")
+fi
+
 # This variable allows specifying which env vars to keep for Nix pure shell
 # The separator is a colon
 if [[ -n "${_NIX_KEEP}" ]]; then

nix/shells.nix

@@ -66,7 +66,7 @@ let
     # helpers for use with target argument
     ios = targets.mobile.ios.shell;
     android = targets.mobile.android.shell;
-    status-go = targets.status-go.mobile.android {};
+    status-go = targets.status-go.mobile.android;
   };
 
   # for merging the default shell with others

nix/status-go/default.nix

@@ -1,7 +1,7 @@
 { lib, callPackage, mkShell }:
 
 let
-  inherit (lib) getEnvWithDefault attrValues mapAttrs;
+  inherit (lib) getConfig attrValues mapAttrs;
 
   # Metadata common to all builds of status-go
   meta = {
@@ -18,7 +18,7 @@ let
     GitCommit = source.rev;
     Version = source.cleanVersion;
     # FIXME: This should be moved to status-go config.
-    IpfsGatewayURL = getEnvWithDefault "STATUS_GO_IPFS_GATEWAY_URL" "https://ipfs.status.im/";
+    IpfsGatewayURL = getConfig "status-go.ipfs-gateway-url" "https://ipfs.status.im/";
   };
 
   # These are necessary for status-go to show correct version

nix/status-go/mobile/build.nix

@@ -1,4 +1,4 @@
-{ callPackage, lib, buildGoPackage
+{ lib, utils, buildGoPackage
 , androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , meta
 , source
@@ -13,7 +13,6 @@ let
   inherit (lib) concatStringsSep optionalString optional;
   isIOS = platform == "ios";
   isAndroid = platform == "android";
-  enforceXCodeAvailable = callPackage ./enforceXCodeAvailable.nix { };
 
 in buildGoPackage {
   pname = source.repo;
@@ -36,7 +35,7 @@ in buildGoPackage {
   ANDROID_HOME = optionalString isAndroid androidPkgs.sdk;
 
   # Ensure XCode is present for iOS, instead of failing at the end of the build.
-  preConfigure = optionalString isIOS enforceXCodeAvailable;
+  preConfigure = optionalString isIOS utils.enforceXCodeAvailable;
 
   buildPhase = ''
     runHook preBuild

nix/status-go/mobile/default.nix

@@ -1,18 +1,10 @@
 { callPackage, meta, source, goBuildLdFlags }:
 
 {
-  android = {abis ? [ "armeabi-v7a" "arm64-v8a" "x86" ]}: callPackage ./build.nix {
+  android = callPackage ./build.nix {
     platform = "android";
     platformVersion = "23";
-    # Hide different arch naming in gomobile from Android builds.
-    targets = let
-      abiMap = {
-        "armeabi-v7a" = "android/arm";
-        "arm64-v8a"   = "android/arm64";
-        "x86"         = "android/386";
-        "x86_64"      = "android/amd64";
-        };
-      in map (arch: abiMap."${arch}") abis;
+    targets = [ "android/arm" "android/arm64" "android/386" ];
     outputFileName = "status-go-${source.shortRev}.aar";
     inherit meta source goBuildLdFlags;
   };

nix/status-go/mobile/enforceXCodeAvailable.nix

@@ -1,30 +0,0 @@
-{ xcodeWrapper  }:
-
-let
-  RED = "\\033[0;31m";
-  GREEN = "\\033[0;32m";
-  NC = "\\033[0m";
-
-  _xcodeToolsTest = ''
-    xcode=0
-    iPhoneSDK=0
-    export PATH=${xcodeWrapper}/bin:$PATH
-    xcrun xcodebuild -version && xcode=1
-    [ $xcode -eq 1 ] && xcrun --sdk iphoneos --show-sdk-version > /dev/null && iPhoneSDK=1
-  '';
-  _xcodeToolReportScript = tool-name: ''[ $SELECTED -eq 0 ] && echo -e "${NC}- ${RED}[ ] ${tool-name}" || echo -e "${NC}- ${GREEN}[√] ${tool-name}${RED}"'';
-  _xcodeToolsReportScript = ''
-    echo -e "${RED}There are some required tools missing in the system:"
-    export SELECTED=$xcode; ${_xcodeToolReportScript "Xcode ${_xcodeVersion}"}
-    export SELECTED=$iPhoneSDK; ${_xcodeToolReportScript "iPhone SDK"}
-  '';
-  _xcodeVersion = builtins.replaceStrings ["xcode-wrapper-"] [""] xcodeWrapper.name;
-in
-  ''
-    ${_xcodeToolsTest}
-    if [ $xcode -eq 0 ]; then
-      ${_xcodeToolsReportScript}
-      echo -e "Please install Xcode ${_xcodeVersion} from the App Store.${NC}"
-      exit 1
-    fi
-  ''

nix/status-go/source.nix

@@ -1,10 +1,9 @@
-{ lib, fetchFromGitHub }:
+{ utils, lib, fetchFromGitHub }:
 
 let
-  inherit (lib) strings traceValFn importJSON getEnvWithDefault;
+  inherit (lib) strings traceValFn importJSON getConfig;
 
-  # TODO: move to default?
-  srcOverride = getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null;
+  srcOverride = getConfig "status-go.src-override" null;
   # Warning message about using local sources
   localSrcWarn = (path: "Using local status-go sources from ${path}");
 
@@ -44,7 +43,7 @@ let
     rev = versionJSON.commit-sha1;
     shortRev = strings.substring 0 7 rev;
     rawVersion = versionJSON.version;
-    cleanVersion = lib.sanitizeVersion versionJSON.version;
+    cleanVersion = utils.sanitizeVersion versionJSON.version;
     # Need to pretend this is from status-im to let Go build it.
     goPackagePath = "github.com/status-im/${repo}";
     src = fetchFromGitHub {

nix/tools/envParser.nix

@@ -0,0 +1,35 @@
+# This Nix expression takes care of reading/parsing the correct .env configuration file and return it as an attr set
+{ config, lib }:
+
+let
+  inherit (builtins) listToAttrs head tail readFile;
+  inherit (lib) attrByPath filter hasPrefix nameValuePair splitString;
+
+  build-type = attrByPath ["status-im" "build-type"] "" config;
+
+  readLinesFromFile =
+    file:
+      let
+        lines = splitString "\n" (readFile file);
+        removeComments = filter (line: line != "" && !(hasPrefix "#" line));
+        meaningfulLines = removeComments lines;
+      in
+        meaningfulLines;
+  readFlagsFromFile =
+    file:
+      let
+        lines = readLinesFromFile file;
+        genAttrs = lines:
+          listToAttrs (map (line:
+            let flag = splitString "=" line;
+            in nameValuePair (head flag) (head (tail flag))) lines);
+      in
+        genAttrs lines;
+  envFileName =
+    if build-type == "release" then ../../.env.release else
+    if build-type == "nightly" then ../../.env.nightly else
+    if build-type == "e2e"     then ../../.env.e2e else
+    if build-type == "pr"      then ../../.env.jenkins else ../../.env;
+  flags = readFlagsFromFile envFileName; # TODO: Simplify this path search with lib.locateDominatingFile
+
+in flags

nix/tools/gradlePropParser.nix

@@ -0,0 +1,20 @@
+# Parser for android/gradle.properties file.
+# Returns an attrset with keys and values from it.
+{ lib }:
+
+gradlePropsFile:
+
+let
+  inherit (lib) head last filter listToAttrs splitString nameValuePair hasPrefix readFile;
+
+  # Read lines
+  lines = splitString "\n" (readFile gradlePropsFile);
+
+  isKeyValueLine = line: line != "" && !hasPrefix "#" line;
+  cleanup = filter isKeyValueLine;
+  extractKeyValues = line:
+    let flag = splitString "=" line;
+    in nameValuePair (head flag) (last flag);
+  parseAttrs = lines: listToAttrs (map extractKeyValues lines);
+in
+  parseAttrs (cleanup lines)

nix/tools/utils.nix

@@ -0,0 +1,64 @@
+{ xcodeWrapper, lib }:
+
+#
+# This is a collection of various utilities used throught this repo.
+#
+
+let
+  RED = "\\033[0;31m";
+  GREEN = "\\033[0;32m";
+  NC = "\\033[0m";
+
+  _xcodeToolsTest = ''
+    xcode=0
+    iPhoneSDK=0
+    export PATH=${xcodeWrapper}/bin:$PATH
+    xcrun xcodebuild -version && xcode=1
+    [ $xcode -eq 1 ] && xcrun --sdk iphoneos --show-sdk-version > /dev/null && iPhoneSDK=1
+  '';
+  _xcodeToolReportScript = tool-name: ''[ $SELECTED -eq 0 ] && echo -e "${NC}- ${RED}[ ] ${tool-name}" || echo -e "${NC}- ${GREEN}[√] ${tool-name}${RED}"'';
+  _xcodeToolsReportScript = ''
+    echo -e "${RED}There are some required tools missing in the system:"
+    export SELECTED=$xcode; ${_xcodeToolReportScript "Xcode ${_xcodeVersion}"}
+    export SELECTED=$iPhoneSDK; ${_xcodeToolReportScript "iPhone SDK"}
+  '';
+  _xcodeVersion = builtins.replaceStrings ["xcode-wrapper-"] [""] xcodeWrapper.name;
+
+  enforceXCodeAvailable = ''
+    ${_xcodeToolsTest}
+    if [ $xcode -eq 0 ]; then
+      ${_xcodeToolsReportScript}
+      echo -e "Please install Xcode ${_xcodeVersion} from the App Store.${NC}"
+      exit 1
+    fi
+  '';
+
+  enforceiPhoneSDKAvailable = ''
+    ${_xcodeToolsTest}
+    if [ $iPhoneSDK -eq 0 ]; then
+      ${_xcodeToolsReportScript}
+      if [ $xcode -eq 1 ]; then
+        echo -e "Please install the iPhone SDK in Xcode.${NC}""
+      else
+        echo -e "Please install Xcode ${_xcodeVersion} from the App Store, and then the iPhone SDK.${NC}""
+      fi
+      exit 1
+    fi
+  '';
+
+  # paths don't like slashes in them
+  dropSlashes = builtins.replaceStrings [ "/" ] [ "_" ];
+  # if version doesn't match this it's probably a commit, it's lax semver
+  versionRegex = "^v?[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+[[:alnum:]+_.-]*$";
+  sanitizeVersion = version:
+    if (builtins.match versionRegex version) != null
+    # Geth forces a 'v' prefix for all versions
+    then lib.removePrefix "v" (dropSlashes version)
+    # reduce metrics cardinality in Prometheus
+    else lib.traceValFn (_: "WARNING: Marking build version as 'develop'!") "develop";
+
+in {
+  inherit sanitizeVersion
+          enforceXCodeAvailable
+          enforceiPhoneSDKAvailable;
+}

package.json

@@ -49,7 +49,6 @@
     "react-native-fetch-polyfill": "^1.1.2",
     "react-native-fs": "^2.14.1",
     "react-native-gesture-handler": "2.6.1",
-    "react-native-gifted-charts": "^1.3.2",
     "react-native-haptic-feedback": "^1.9.0",
     "react-native-hole-view": "git+https://github.com/status-im/react-native-hole-view.git#refs/tags/v2.1.3-status",
     "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.0",
@@ -57,7 +56,7 @@
     "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
     "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#refs/tags/v.3.0.0-5-status",
     "react-native-languages": "^3.0.2",
-    "react-native-linear-gradient": "^2.8.0",
+    "react-native-linear-gradient": "^2.5.6",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
     "react-native-navigation": "^7.27.1",
@@ -70,9 +69,9 @@
     "react-native-share": "^8.2.2",
     "react-native-static-safe-area-insets": "^2.2.0",
     "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
-    "react-native-svg": "13.10.0",
+    "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
-    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
+    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.0.9",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
     "react-syntax-highlighter": "^15.5.0",
     "rn-emoji-keyboard": "0.7.0",
@@ -100,7 +99,7 @@
     "process": "0.11.10",
     "react-test-renderer": "18.0.0",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
-    "shadow-cljs": "2.25.0"
+    "shadow-cljs": "2.11.16"
   },
   "binary": {
     "module_name": "status_nodejs_addon",

scripts/build-android.sh

@@ -22,7 +22,15 @@ function append_env_export() {
   echo "export ${VAR_NAME}=\"${VAR_VALUE}\";" >> "${SECRETS_FILE_PATH}"
 }
 
-export COMMIT_HASH="$(git rev-parse --verify HEAD)"
+config=''
+if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
+  config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
+fi
+config+="status-im.commit-hash=\"$(git rev-parse --verify HEAD)\";"
+config+="status-im.build-type=\"$(must_get_env BUILD_TYPE)\";"
+config+="status-im.build-number=\"$(must_get_env BUILD_NUMBER)\";"
+config+="status-im.android.abi-split=\"$(must_get_env ANDROID_ABI_SPLIT)\";"
+config+="status-im.android.abi-include=\"$(must_get_env ANDROID_ABI_INCLUDE)\";"
 nixOpts=()
 
 # We create if now so the trap knows its location
@@ -65,5 +73,6 @@ else
   nixOpts+=("--option" "build-use-sandbox" "true")
 fi
 
+nixOpts+=("--arg" "config" "{${config}}")
 
 "${GIT_ROOT}/nix/scripts/build.sh" targets.mobile.android.release "${nixOpts[@]}"

scripts/import-pr.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  echo "Please provide the full branch URL as an argument."
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+    echo "Please provide the full pull request URL as second argument."
+    exit 1
+fi
+
+# Extract PR number from the URL
+PR_URL="$2"
+PR_NUMBER=$(echo "$PR_URL" | awk -F '/' '{print $NF}')
+
+# Fetch PR Info
+PR_TITLE=$(gh pr view "$PR_NUMBER" --json title -q '.title')
+PR_DESCRIPTION=$(gh pr view "$PR_NUMBER" --json body -q '.body')
+BRANCH_NAME=$(gh pr view "$PR_NUMBER" --json headRefName -q '.headRefName')
+
+# Extracting the repo URL and branch name
+FULL_URL="$1"
+REPO_URL=$(echo "$FULL_URL" | awk -F "/tree/" '{print $1}')
+REPO_NAME=$(basename "$REPO_URL")
+NEW_REMOTE_URL="https://github.com/status-im/status-mobile"
+
+# Clone the repo if not already cloned
+if [ ! -d "$REPO_NAME" ]; then
+    git clone "$REPO_URL"
+    cd "$REPO_NAME" || exit
+    gh repo set-default "$REPO_URL"
+else
+    cd "$REPO_NAME" || exit
+    gh repo set-default "$REPO_URL"
+    git fetch
+fi
+
+# Check if branch already exists
+BRANCH_EXISTS=$(git show-ref refs/heads/"$BRANCH_NAME" 2>/dev/null)
+
+if [ -z "$BRANCH_EXISTS" ]; then
+    # New Import
+    git checkout -b "$BRANCH_NAME" "origin/$BRANCH_NAME"
+    git remote add source "$REPO_URL"
+    git remote set-url origin $NEW_REMOTE_URL
+    git push -u origin "$BRANCH_NAME"
+    gh pr create --base develop --head "$BRANCH_NAME" --title "[IMPORTED] $PR_TITLE" --body "$PR_DESCRIPTION"
+else
+    # Sync Existing Import
+    git checkout "$BRANCH_NAME"
+    git fetch source "$BRANCH_NAME"
+    git rebase source/"$BRANCH_NAME" # Rebase instead of merge
+    git push origin "$BRANCH_NAME" # Push updates to your imported branch
+fi

scripts/lint-re-frame-in-quo-components.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.|status-im2\.)' --include '*.cljs' --include '*.clj' './src/quo2')
+INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.|status-im2\.)' './src/quo2')
 
 if test -n "$INVALID_CHANGES"; then
     echo "WARNING: re-frame, status-im are not allowed in quo2 components"

shadow-cljs.edn

@@ -3,27 +3,23 @@
 
  :dependencies [[reagent "1.2.0"]
                 [re-frame "1.3.0"]
-                [binaryage/oops "0.7.2"]
+                [binaryage/oops "0.7.0"]
                 [com.andrewmcveigh/cljs-time "0.5.2"]
                 [status-im/timbre "4.10.0-2-status"]
+                [com.taoensso/encore "2.105.0"]
                 [hickory "0.7.1"]
                 [cljs-bean "1.3.0"]
                 [com.cognitect/transit-cljs "0.8.248"]
                 [mvxcvi/alphabase "1.0.0"]
                 [camel-snake-kebab "0.4.3"]
-                ;; Dev dependencies
+                ;; dev dependencies
                 [refactor-nrepl "2.5.0"]
                 [cider/cider-nrepl "0.25.3"]
                 [cider/piggieback "0.4.1"]
                 [re-frisk-remote "1.6.0"]
-                ;; We don't use the encore library, but re-frisk requires re-frisk/sente (fork of
-                ;; com.taoensso/sente), which in turn requires encore. We need to bump encore to
-                ;; 3.21.0+ to remove a warning displayed while shadow-cljs starts (commit
-                ;; https://github.com/ptaoussanis/encore/commit/f7a21567b9611a63999609ca183c7fb175034bd6).
-                [com.taoensso/encore "3.21.0"]
-                ;; Routing
+                ;; routing
                 [bidi "2.1.6"]
-                ;; Test dependencies
+                ;; test dependencies
                 [day8.re-frame/test "0.1.5"]
                 [com.taoensso/tufte "2.1.0"]]
 
@@ -52,9 +48,10 @@
                     :after-load-async  status-im2.setup.hot-reload/reload
                     :build-notify      status-im2.setup.hot-reload/build-notify
                     :preloads          [re-frisk-remote.preload
-                                        ;; In order to use component test helpers in the REPL we
-                                        ;; need to preload namespaces that are not normally required
-                                        ;; by production code, such as
+                                        ;; In order to use component test helpers in
+                                        ;; the REPL we need to preload namespaces
+                                        ;; that are not normally required by
+                                        ;; production code, such as
                                         ;; @testing-library/react-native.
                                         test-helpers.component]}
          :closure-defines
@@ -102,8 +99,8 @@
    :output-dir "target/test"
    :optimizations :simple
    :target :node-test
-   ;; Uncomment line below to `make test-watch` a specific file
-   ;; :ns-regexp "status-im2.subs.chat.messages-test$"
+   ;; When running tests without a REPL you can uncomment below line to `make test-watch` a specific file
+   ;; :ns-regexp        "status-im2.subs.chat.messages-test$"
    :main
    status-im.test-runner/main
    ;; set :ui-driven to true to let shadow-cljs inject node-repl

src/mocks/js_dependencies.cljs

@@ -10,14 +10,14 @@
 ;; (-> reanimated/slide-out-up-animation (.damping 20) .springify (.stiffness 300))
 (js/eval
  "
- var globalThis
- if (typeof window === \"undefined\") {
-   globalThis = global
- } else {
-   globalThis = window
- }
- globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return () => globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__}})
- ")
+var globalThis
+if (typeof window === \"undefined\") {
+  globalThis = global
+} else {
+  globalThis = window
+}
+globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return () => globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__}})
+")
 
 (def action-button #js {:default #js {:Item #js {}}})
 (def config #js {:default #js {}})
@@ -90,8 +90,7 @@
                                :configureNext (fn [])}
     :requireNativeComponent   (fn [] {:propTypes ""})
     :Appearance               {:getColorScheme    (fn [])
-                               :addChangeListener (fn [])}
-    :PixelRatio               {:get (fn [])}}))
+                               :addChangeListener (fn [])}}))
 
 (set! js/ReactNative react-native)
 
@@ -139,17 +138,15 @@
 (def react-native-share #js {:default {}})
 (def react-native-svg
   #js
-   {:ClipPath       #js {:render identity}
-    :Circle         #js {:render identity}
-    :Defs           #js {:render identity}
-    :G              #js {:render identity}
-    :Path           #js {:render identity}
-    :Rect           #js {:render identity}
-    :SvgUri         #js {:render identity}
-    :SvgXml         #js {:render identity}
-    :LinearGradient #js {:render identity}
-    :Stop           #js {:render identity}
-    :default        #js {:render identity}})
+   {:ClipPath #js {:render identity}
+    :Circle   #js {:render identity}
+    :Defs     #js {:render identity}
+    :G        #js {:render identity}
+    :Path     #js {:render identity}
+    :Rect     #js {:render identity}
+    :SvgUri   #js {:render identity}
+    :SvgXml   #js {:render identity}
+    :default  #js {:render identity}})
 (def react-native-webview #js {:default {}})
 (def react-native-audio-toolkit
   #js
@@ -349,13 +346,6 @@
 
 (def react-native-transparent-video #js {:default #js {}})
 
-(def react-native-gifted-charts
-  #js
-   {:BarChart         #js {}
-    :PieChart         #js {}
-    :LineChart        #js {}
-    :LineChartBicolor #js {}})
-
 (def wallet-connect-client
   #js
    {:default       #js {}
@@ -419,7 +409,6 @@
     "react-native-svg"                               react-native-svg
     "react-native-transparent-video"                 react-native-transparent-video
     "react-native-orientation-locker"                react-native-orientation-locker
-    "react-native-gifted-charts"                     react-native-gifted-charts
     "../src/js/worklets/core.js"                     worklet-factory
     "../src/js/worklets/shell/bottom_tabs.js"        #js {}
     "../src/js/worklets/shell/home_stack.js"         #js {}

src/native_module/core.cljs

@@ -258,13 +258,6 @@
   (log/debug "[native-module] hash-message")
   (.hashMessage ^js (status) message callback))
 
-(defn start-searching-for-local-pairing-peers
-  "starts a UDP multicast beacon that both listens for and broadcasts to LAN peers"
-  [callback]
-  (log/info "[native-module] Start Searching for Local Pairing Peers"
-            {:fn :start-searching-for-local-pairing-peers})
-  (.startSearchForLocalPairingPeers ^js (status) callback))
-
 (defn local-pairing-preflight-outbound-check
   "Checks whether the device has allows connecting to the local server"
   [callback]

src/quo2/README.md

@@ -1,186 +0,0 @@
-# Quo Library
-
-Quo is the name of our mobile *component library* that implements the [Status
-Design System for Mobile](https://www.figma.com/file/WQZcp6S0EnzxdTL4taoKDv/Design-System-for-Mobile).
-
-The overarching goals of having this component library are:
-
-- Achieve the highest possible fidelity between code and the design system in
-  Figma.
-- Decouple components from ever-changing business requirements.
-
-> [!NOTE]
-> This document captures our current practices and guidelines for implementing
-> the design system. For guidelines that apply across the entire project, take
-> a look at [new-guidelines](/doc/new-guidelines.md).
-
-## Directory structure and file names
-
-We follow one basic rule: mirror Figma *pages* and their *component names* in
-the directory structure.
-
-For example, in the screenshot below we see the Figma page is `Banners`
-and the component name is `Banner`.
-
-<img src="/doc/images/quo-component.png" width="600" />
-
-Therefore, the structure should look like:
-
-```
-quo2/
-└── components/
-    └── banners/
-        └── banner/
-            ├── component_spec.cljs
-            ├── style.cljs
-            └── view.cljs
-```
-
-Files `view.cljs`, `style.cljs`, and `component_spec.cljs` should always have
-the same name, regardless of component.
-
-## Component API
-
-Adhere to the **same component properties and values** used in a Figma component
-when translating it to Clojure. This means using the same names for props and
-the same values. If the Figma property is a boolean, use a question mark suffix
-to make the name more idiomatic in Clojure.
-
-We have found over time that the less we drift from the design system the
-better. Some key benefits:
-
-- It helps developers quickly check for issues when comparing the code with the
-  source of truth in Figma.
-- It is easier for pull-request reviewers to double-check components for
-  correctness.
-- It helps developers create preview screens that are identical or very similar
-  to Figma, which aids in spotting bugs more easily.
-- It helps designers review all component variations in preview screens.
-
-<img src="/doc/images/figma-properties.png" width="600" />
-
-In the image above we can see the properties are `Type`, `State`, `Size`,
-`Icon`, `Theme`, and `Background`. Translated to Clojure:
-
-```clojure
-;; ns quo2.components.buttons.button.view
-(def view
-  [{:keys [type state size icon theme background]}]
-  ...)
-```
-
-## Clojure var conventions
-
-- Due to the fact that every `view` namespace should export only one component
-  and to avoid the redundancy of `[some-component/some-component ...]`, name the
-  public var `view` as well.
-- Try to make all other vars private because they should almost never be used
-  directly.
-
-## Component tests
-
-We don't attempt to write component tests verifying how components look on the
-screen. Instead, we have found a middle ground, where the focus is on verifying
-if events are triggered as intended and that all component variations are
-rendered. We use [React Native Testing Library](https://callstack.github.io/react-native-testing-library/).
-
-There are dozens of examples in the repository, so use them as a reference. A
-good and complete example is [quo2.components.avatars.user-avatar.component-spec](/src/quo2/components/avatars/user_avatar/component_spec.cljs)
-
-## Do not couple the library with re-frame
-
-Don't use re-frame inside this library (e.g. dispatch & subscribe). If a
-component needs to be stateful, the state should be local to its rendering
-lifecycle (using `reagent.core/atom`). Additionally, if the component requires
-any other data, it should be passed as arguments.
-
-```clojure
-;; bad
-(defn view []
-  (let [window-width (rf/sub [:dimensions/window-width])]
-    [rn/pressable {:on-press #(rf/dispatch [:do-xyz])}
-     (do-something window-width)]))
-
-;; good
-(defn view [{:keys [window-width on-press]}]
-  [rn/pressable {:on-press on-press}
-   (do-something window-width)])
-```
-
-## Themes
-
-Our goal is to make all design system components *themeable*, which means they
-should not use, nor fallback to the OS theme, because themes are *contextual*
-and can be overridden in specific parts of the app.
-
-To achieve this, use the higher-order function `quo2.theme/with-theme` to
-automatically inject the current theme context (based on the [React Context
-API](https://react.dev/learn/passing-data-deeply-with-context)).
-
-Use the following pattern:
-
-```clojure
-(ns quo2.components.<figma page>.<component name>.view
-  (:require [quo2.theme :as quo.theme]))
-
-(defn- view-internal [{:keys [theme]}]
-  ...)
-
-(def view (quo.theme/with-theme view-internal))
-```
-
-Then pass the `theme` value down to all functions that may rely on the OS theme,
-like `quo2.foundations.colors/theme-colors` or `quo2.foundations.shadows/get`.
-
-## Avoid using quo's version number in namespace aliases
-
-When requiring quo2 namespaces, don't use the version number in the
-[alias](https://clojure.org/guides/learn/namespaces#_require), unless for a
-special reason you need to require both the old and new namespaces in the same
-file.
-
-> [!NOTE]
-> Keep in mind that, at the moment, we need to keep both `src/quo/` and
-> `src/quo2/` directories in the repository, but eventually the old one will go
-> away and the version number will lose its meaning.
-
-```clojure
-;; bad
-(ns ...
-  (require [quo2.theme :as quo2.theme]
-           [quo2.core :as quo2]))
-
-;; good
-(ns ...
-  (require [quo2.theme :as quo.theme]
-           [quo2.core :as quo]))
-```
-
-## Preview screens
-
-Every component should be accompanied by a preview screen in
-`src/status_im2/contexts/quo_preview/`. Ideally, **all possible variations in
-Figma should be achievable in the preview screen** by changing the input values
-without resorting to code changes. Designers will also use this capability to
-review components in PR builds.
-
-## Allow outermost containers to have their styles overridden
-
-If a component needs to be wrapped in a `rn/view` instance to force it to be
-styled differently, consider changing the component to accept a
-`container-style` argument. This will help reduce the number of nodes to be
-rendered.
-
-```clojure
-;; bad
-[rn/view {:style {:margin-right 12}}
- [quo/button
-  {:size 32}
-  :i/info]]
-
-;; good
-[quo/button
- {:size            32
-  :container-style {:margin-right 12}}
- :i/info]
-```

src/quo2/components/avatars/account_avatar.cljs

@@ -0,0 +1,41 @@
+(ns quo2.components.avatars.account-avatar
+  (:require [quo2.components.icon :as icons]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]))
+
+(defn get-border-radius
+  [size]
+  (case size
+    80 16
+    48 12
+    32 10
+    24 8
+    20 6))
+
+(defn get-inner-icon-sizes
+  [size]
+  (case size
+    80 36
+    48 24
+    32 15
+    24 11
+    20 11))
+
+(defn account-avatar
+  [{:keys [size icon color]
+    :or   {size  80
+           icon  :i/placeholder
+           color :purple}}]
+  (let [icon-color           (colors/custom-color-by-theme color 50 60)
+        avatar-border-radius (get-border-radius size)
+        inner-icon-size      (get-inner-icon-sizes size)]
+    [rn/view
+     {:style {:width            size
+              :background-color icon-color
+              :height           size
+              :border-radius    avatar-border-radius
+              :justify-content  :center
+              :align-items      :center}}
+     [icons/icon icon
+      {:no-color true
+       :size     inner-icon-size}]]))

src/quo2/components/avatars/account_avatar/component_spec.cljs

@@ -1,90 +0,0 @@
-(ns quo2.components.avatars.account-avatar.component-spec
-  (:require [quo2.components.avatars.account-avatar.view :as account-avatar]
-            [quo2.components.avatars.account-avatar.style :as style]
-            [test-helpers.component :as h]
-            [quo2.foundations.colors :as colors]))
-
-(h/describe "Account Avatar"
-  (h/test "default render"
-    (h/render [account-avatar/view])
-    (h/is-truthy (h/query-by-label-text :account-avatar))
-    (h/is-truthy (h/query-by-label-text :account-emoji)))
-
-  (h/test "with emoji"
-    (let [emoji "💸"]
-      (h/render [account-avatar/view {:emoji emoji :size 80}])
-      (h/is-truthy (h/query-by-label-text :account-avatar))
-      (h/is-truthy (h/query-by-label-text :account-emoji))
-      (h/is-truthy (h/query-by-text emoji))))
-
-  (h/test "size 80 with emoji, with type - default"
-    (let [opts {:emoji               "🏝️"
-                :size                80
-                :type                :default
-                :customization-color :blue}]
-      (h/render [account-avatar/view opts])
-      (h/is-truthy (h/query-by-label-text :account-avatar))
-      (h/has-style (h/get-by-label-text :account-avatar)
-                   {:height          (:size opts)
-                    :width           (:size opts)
-                    :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 60)})
-      (h/is-truthy (h/query-by-label-text :account-emoji))
-      (h/has-style (h/query-by-label-text :account-emoji)
-                   {:fontSize (style/get-emoji-size (:size opts))})
-      (h/is-truthy (h/query-by-text (:emoji opts)))))
-
-  (h/test "size 48 with emoji, with type - watch only"
-    (let [opts {:emoji               "💵"
-                :size                48
-                :type                :watch-only
-                :customization-color :purple}]
-      (h/render [account-avatar/view opts])
-      (h/is-truthy (h/query-by-label-text :account-avatar))
-      (h/has-style
-       (h/get-by-label-text :account-avatar)
-       {:height          (:size opts)
-        :width           (:size opts)
-        :borderRadius    (style/get-border-radius (:size opts))
-        :borderWidth     1
-        :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 50 10 10)})
-      (h/is-truthy (h/query-by-label-text :account-emoji))
-      (h/has-style (h/query-by-label-text :account-emoji)
-                   {:fontSize (style/get-emoji-size (:size opts))})
-      (h/is-truthy (h/query-by-text (:emoji opts)))))
-
-  (h/test "size 28 with emoji, with type - default"
-    (let [opts {:emoji               "🏝️"
-                :size                28
-                :type                :default
-                :customization-color :turquoise}]
-      (h/render [account-avatar/view opts])
-      (h/is-truthy (h/query-by-label-text :account-avatar))
-      (h/has-style (h/get-by-label-text :account-avatar)
-                   {:height          (:size opts)
-                    :width           (:size opts)
-                    :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 60)})
-      (h/is-truthy (h/query-by-label-text :account-emoji))
-      (h/has-style (h/query-by-label-text :account-emoji)
-                   {:fontSize (style/get-emoji-size (:size opts))})
-      (h/is-truthy (h/query-by-text (:emoji opts)))))
-
-  (h/test "size 16 with emoji, with type - watch only"
-    (let [opts {:emoji               "🎉"
-                :size                16
-                :type                :watch-only
-                :customization-color :copper}]
-      (h/render [account-avatar/view opts])
-      (h/is-truthy (h/query-by-label-text :account-avatar))
-      (h/has-style
-       (h/get-by-label-text :account-avatar)
-       {:height          (:size opts)
-        :width           (:size opts)
-        :borderRadius    (style/get-border-radius (:size opts))
-        :borderWidth     0.8
-        :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 50 10 10)})
-      (h/is-truthy (h/query-by-label-text :account-emoji))
-      (h/has-style (h/query-by-label-text :account-emoji)
-                   {:fontSize (style/get-emoji-size (:size opts))})
-      (h/is-truthy (h/query-by-text (:emoji opts))))))