test

* fix: composer height when entering and canceling edit

* fix: blur the composer input when canceling edit

* fix: focusing animation and composer height after blur

* fix: input height when canceling edit while unfocused

* ref: removed arbitrary keyboard check

* fix: moved edit-mentions logic to use-edit to fix unresolved mention

* fix: composer edit should put the cursor at the end

* fix: (potentially) fixing the mention not resolved during edit

* fix: emoji-kb handler changing the height when default kb appears

* Fix text content when editing and reentering chat

* prevent composer when focusing on opening chat with edit/reply

* clean

* Clauxx comments

* Apply for reply

* Lintil soup = yummy

* refactor variable name

* Extract the focusing logic from the data setting logic

* Edge case

* fix: composer mention key & edit re-enter issues

* fix: reply cancel input blur and smooth reply focus

---------

Co-authored-by: Ibrkhalil <vampirekid017@gmail.com>

.carve_ignore

@@ -50,13 +50,6 @@ status-im2.config/rpc-networks-only?
 status-im2.config/waku-enabled?
 status-im.utils.pairing/has-paired-installations?
 status-im.tribute-to-talk.core-test/user-cofx
-quo.gesture-handler/tap-gesture-handler
-quo.gesture-handler/pan-gesture-handler
-quo.gesture-handler/long-press-gesture-handler
-quo.gesture-handler/pure-native-button
-quo.gesture-handler/createNativeWrapper
-quo.gesture-handler/animated-raw-button
-quo.gesture-handler/states
 mocks.js-dependencies/action-button
 mocks.js-dependencies/camera
 mocks.js-dependencies/dismiss-keyboard
@@ -100,46 +93,13 @@ react-native.fs/read-dir
 react-native.fs/mkdir
 react-native.fs/unlink
 react-native.fs/file-exists?
-quo.animated/code
-quo.animated/eq
-quo.animated/neq
-quo.animated/greater-or-eq
-quo.animated/not*
-quo.animated/or*
-quo.animated/and*
-quo.animated/add
-quo.animated/sub
-quo.animated/multiply
-quo.animated/abs
-quo.animated/min*
-quo.animated/max*
-quo.animated/set
-quo.animated/start-clock
-quo.animated/stop-clock
-quo.animated/bezier
-quo.animated/linear
-quo.animated/set-value
-quo.animated/clock
-quo.animated/debug
-quo.animated/log
-quo.animated/event
-quo.animated/on-change
-quo.animated/cond*
-quo.animated/block
-quo.animated/call*
-quo.animated/timing
-quo.animated/spring
-quo.animated/clamp
-quo.animated/with-spring
-quo.animated/with-timing
-quo.animated/re-timing
-quo.design-system.colors/white
-quo.design-system.colors/black
+status-im.ui.components.colors/white
+status-im.ui.components.colors/black
 status-im.transport.core-test/messages
-quo.core/animated-header
-quo.core/safe-area-provider
-quo.core/safe-area-consumer
-quo.core/safe-area-view
+status-im.ui.components.core/animated-header
+status-im.ui.components.core/safe-area-provider
+status-im.ui.components.core/safe-area-consumer
+status-im.ui.components.core/safe-area-view
 status-im.utils.universal-links.core/open!
 status-im.transport.filters.core-test/member-2
 status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
@@ -189,7 +149,7 @@ status-im.utils.async/async-periodic-run!
 status-im.desktop.core/app-root
 status-im.desktop.core/init
 status-im.chat.models-test/test-db
-quo.design-system.spacing/padding-vertical
+status-im.ui.components.spacing/padding-vertical
 status-im.utils.money/percent-change
 utils.debounce/clear-all
 status-im.transport.db/create-chat
@@ -206,7 +166,6 @@ status-im.ui.components.animation/add
 status-im.ui.components.animation/subtract
 status-im.ui.components.animation/get-layout
 status-im.wallet.transactions-test/uri-query-data
-quo.react-native/touchable-highlight
 status-im.utils.name/shortened-name
 status-im.ui.components.button.haptic/trigger
 status-im.contact.db/filter-dapps

.clj-kondo/babashka/fs/config.edn

@@ -0,0 +1 @@
+{:lint-as {babashka.fs/with-temp-dir clojure.core/let}}

.clj-kondo/babashka/sci/config.edn

@@ -0,0 +1 @@
+{:hooks {:macroexpand {sci.core/copy-ns sci.core/copy-ns}}}

.clj-kondo/babashka/sci/sci/core.clj

@@ -0,0 +1,9 @@
+(ns sci.core)
+
+(defmacro copy-ns
+  ([ns-sym sci-ns]
+   `(copy-ns ~ns-sym ~sci-ns nil))
+  ([ns-sym sci-ns opts]
+   `[(quote ~ns-sym)
+     ~sci-ns
+     (quote ~opts)]))

.clj-kondo/config.edn

@@ -1,4 +1,5 @@
-{:lint-as      {status-im.utils.views/defview  clojure.core/defn
+{:config-paths ["status-im"]
+ :lint-as      {status-im.utils.views/defview  clojure.core/defn
                 status-im.utils.views/letsubs  clojure.core/let
                 reagent.core/with-let          clojure.core/let
                 status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
@@ -45,6 +46,7 @@
                 :single-operand-comparison     {:level :error}
                 :syntax                        {:level :error}
                 :unbound-destructuring-default {:level :error}
+                :uninitialized-var             {:level :error}
                 :unknown-require-option        {:level :error}
                 :unreachable-code              {:level :error}
                 :unresolved-namespace          {:level :error}
@@ -54,7 +56,7 @@
                                                           number
                                                           status-im.test-helpers/restore-app-db]}
                 :unresolved-var                {:level :error}
-                :uninitialized-var             {:level :error}
+                :unsorted-required-namespaces  {:level :error}
                 :unused-alias                  {:level :warning}
                 :unused-binding                {:level :error}
                 :unused-import                 {:level :error}

.clj-kondo/status-im/config.edn

@@ -0,0 +1,2 @@
+{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
+ :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.clj-kondo/status-im/utils/i18n.clj

@@ -0,0 +1,26 @@
+(ns utils.i18n
+  (:require [clj-kondo.hooks-api :as hooks]))
+
+(defn label
+  "Verify call to `utils.i18n/label` pass the translation keyword qualified with `t`."
+  [{:keys [node]}]
+  (let [[_ translation-key-node & _] (:children node)]
+    (when (and (hooks/keyword-node? translation-key-node)
+               (not= "t" (-> translation-key-node hooks/sexpr namespace)))
+      (hooks/reg-finding! (assoc (meta translation-key-node)
+                                 :message "Translation keyword should be qualified with \"t\""
+                                 :type    :status-im.linter/invalid-translation-keyword)))))
+
+(comment
+  ;; Valid
+  (label {:node     (hooks/parse-string "(i18n/label :t/foo {:var \"hello\"})")
+          :cljc     false
+          :lang     :cljs
+          :filename ""
+          :config   {}
+          :ns       ""
+          :context  nil})
+
+  ;; Invalid
+  (label {:node (hooks/parse-string "(i18n/label :foo)")})
+)

.gitignore

@@ -190,3 +190,7 @@ test/appium/tests/users.py
 
 ## git hooks
 lefthook.yml
+
+## clj-kondo
+/.clj-kondo/taoensso/*
+/.clj-kondo/babashka/*

.lsp/config.edn

@@ -0,0 +1 @@
+{:clean {:ns-inner-blocks-indentation :keep}}

.prettierignore

@@ -7,3 +7,4 @@ modules
 result
 target
 component-spec
+/app

.vscode/settings.example.json

@@ -0,0 +1,12 @@
+{
+    "editor.formatOnSave": true,
+    "clojure.format.enable": false,
+    "[clojure]": {
+        "editor.defaultFormatter": "rflagreca.vscode-clj-zprint"
+    },
+    "vscode-clj-zprint.IgnoreExternalFiles": false,
+    "vscode-clj-zprint.CommunityFormatting": false,
+    "vscode-clj-zprint.OptionsMap": "",
+    "vscode-clj-zprint.width": "",
+    "vscode-clj-zprint.Styles.UseOnlyTheseStyles": false
+}

Makefile

@@ -108,7 +108,7 @@ nix-update-clojure: export TARGET := clojure
 nix-update-clojure: ##@nix Update maven Nix expressions based on current clojure setup
 	nix/deps/clojure/generate.sh
 
-nix-update-gems: export TARGET := default
+nix-update-gems: export TARGET := fastlane
 nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
 	fastlane/update.sh
 
@@ -274,11 +274,11 @@ run-re-frisk: ##@run Start re-frisk server
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
 # INFO: If it's empty (no devices attached, parsing issues, script error) - for Nix it's the same as not set.
-run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_arch.sh)
+run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_abis.sh)
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
-SIMULATOR=iPhone 11 Pro
+SIMULATOR=iPhone 13
 run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := iossimulator/amd64
 run-ios: ##@run Build iOS app and start it in a simulator/device
@@ -312,12 +312,13 @@ lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
 	@sh scripts/lint-re-frame-in-quo-components.sh && \
-	sh scripts/lint-old-quo-usage.sh && \
+	sh scripts/lint-direct-require-component-outside-quo.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
+	scripts/lint_translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
 	sh scripts/lint-trailing-newline.sh && \
-	yarn prettier
+	node_modules/.bin/prettier --write .
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := clojure
@@ -325,8 +326,9 @@ lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
+	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
 	sh scripts/lint-trailing-newline.sh --fix && \
-	yarn prettier
+	node_modules/.bin/prettier --write .
 
 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
@@ -362,6 +364,7 @@ component-test-watch: export TARGET := clojure
 component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
+	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn install
 	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
@@ -370,6 +373,7 @@ component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
 component-test: export BABEL_ENV := test
 component-test: ##@test Run component tests once in NodeJS
+	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn install
 	yarn shadow-cljs compile component-test && \

README.md

@@ -6,7 +6,7 @@
 
 [Get it on Github](https://github.com/status-im/status-mobile/releases)
 
-Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.
+Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middlemen and `go-ethereum` running directly on your device.
 
 [![Getting started with Status](https://i.imgur.com/C0aZZEL.jpg)](https://www.youtube.com/watch?v=oDCSEmS9c3o "Getting started with Status")
 
@@ -14,9 +14,9 @@ Join us in creating a browser, messenger, and gateway to a decentralized world.
 
 We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.
 
-We want to take responsibility for our data, the way we conduct ourselves privately and promote this way of life to a mass audience.
+We want to take responsibility for our data, and the way we conduct ourselves privately and promote this way of life to a mass audience.
 
-We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provide us a path forward.
+We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provide us with a path forward.
 
 If this interests you, **help us make Status a reality** - anyone can contribute and we need everyone at any skill level to participate.
 
@@ -37,26 +37,26 @@ project dependencies, coding guidelines and testing procedures.
 Check out our [coding guidelines](doc/new-guidelines.md).
 
 - **Community Management**
-Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
+Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and the long-lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
 
 - **Specification / Documentation**
-John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.
+John Dewey once said, "Education is not preparation for life; education is life *itself* ". Developers and Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.
 
 - **Blog Writing**
 Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page.
 
 - **Testers**
-It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](doc/starting-guide.md) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
+It's bug-hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](doc/starting-guide.md) or if an android user checks out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
 
 - **Security**
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!
 
 - **Evangelism**
-Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
+Help us spread the word! Tell a friend *right now*, in fact, tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
 
 ## Give me Binaries!
 
-You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/technical/build_status/).
+You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/), or by [building it yourself](https://status.im/technical/build_status/).
 
 ## Core Contributors
 

RELEASES.md

@@ -25,7 +25,7 @@
 
 ### Redesign
 
-* Quo2, Switcher Navigation by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13167
+* quo, Switcher Navigation by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13167
 * Switcher and Bottom Tabs Animations and UI Performance Improvements by @Parveshdhull in https://github.com/status-im/status-mobile/pull/13470
 * feat: add token tag component (#13599) by @J-Son89 in https://github.com/status-im/status-mobile/pull/13644
 * [13565] icon-avatar component by @ibrkhalil in https://github.com/status-im/status-mobile/pull/13692

VERSION

@@ -1 +1 @@
-1.25.0
+1.26.0

android/app/src/main/AndroidManifest.xml

@@ -33,7 +33,8 @@
             android:name=".MainApplication"
             android:largeHeap="true"
             android:usesCleartextTraffic="true"
-            android:extractNativeLibs="true">
+            android:extractNativeLibs="true"
+            android:requestLegacyExternalStorage="true">
 <!--        After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
             and use`useLegacyPackaging` flag in our app's `build.gradle`-->
         <meta-data android:name="commitHash" android:value="${commitHash}"/>
@@ -62,14 +63,14 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" android:host="join.status.im" />
-                <data android:scheme="https" android:host="join.status.im" />
+                <data android:scheme="http" android:host="status.app" />
+                <data android:scheme="https" android:host="status.app" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="status-im" />
+                <data android:scheme="status-app" />
                 <data android:scheme="ethereum" />
             </intent-filter>
         </activity>

android/gradle.properties

@@ -22,7 +22,7 @@
 
 # Version requirements used throughout the Gradle scripts
 kotlinVersion=1.6.20
-minSdkVersion=23
+minSdkVersion=24
 compileSdkVersion=31
 targetSdkVersion=31
 buildToolsVersion=31.0.0

doc/README.md

@@ -26,6 +26,8 @@
 
 [Creating a pixel perfect UI](pixel-perfection.md)
 
+[Contributing to status-go](status-go-changes.md)
+
 ## Testing
 
 [How to run local tests](testing.md)
@@ -41,6 +43,8 @@
 
 [re-frame usage (recorded meeting)](https://drive.google.com/file/d/1qv_E0CEGzQpu_zGXD0gCTU5EvhC2k8Jy/view)
 
+[status app functionality demo](https://drive.google.com/file/u/0/d/1PmwsMLTLDNNIdv5_6wvMOwoj2PfT50c6/view)
+
 ## Misc
 
 [Importing icons from Figma into project](export-icons.md)

doc/component-tests-overview.md

@@ -23,7 +23,7 @@ setups and runs the test suite once.
 setups and runs the test suite and watches for code changes will then retrigger the test suite.
 
 ## Writing Tests
-New test files will need their namespace added to either the file "src/quo2/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
+New test files will need their namespace added to either the file "src/quo/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
 
 
 ### Best practices

doc/debugging.md

@@ -99,3 +99,38 @@ Also to inspect logs in a more flexible manner, instead of the strict output fro
 adb logcat | grep 'ReactNativeJS\|StatusModule\|GoLog'
 ```
 
+### From @clauxx (visual debugging):
+
+When building/fixing/refactoring components, it can be annoying to set-up the component for instant visual feedback (i.e. finding it in the UI when fixing/refactoring; finding a place for it when building from scratch). Very often if the location of the screen containing your component nested deeply in the app, you might have to do a lot of repeated navigation, nevermind logging in every time the app reloads (even with fast refresh disabled this happens quite often).
+
+To alleviate this discomfort and make the development cycle more *pleasant*, you can use one of the following options (*_both of which involve the ... REPL ༼ つ ╹ ╹ ༽つ, so make sure you have that set-up with your IDE/editor_*)
+
+#### REPL-ing to a screen
+
+This one is straightforward, just evaluate a navigation dispatch form from anywhere:
+
+```cljs
+(comment (rf/dispatch [:navigate-to :your-favorite-buggy-screen]))
+```
+
+> TIP: you can run this from an untracked user namespace `(ns user)`, from which you can experiment or interact with the REPL. This is where I usually keep my development navigation forms.
+
+#### REPL-ing a component
+
+This is also straighforward, but there are some small differences. Just like above, we only have to evaluate a dispatch form, as follows:
+
+```cljs
+;; example debugging a quo component, although it could be any other component e.g. from the `status-im2` ns.
+(comment (re-frame/dispatch [:dev/preview-component
+                      [quo/slide-button
+                       {:track-icon          :face-id
+                        :track-text          "preview component example"
+                        :customization-color :blue
+                        :on-complete         identity}]]))
+```
+
+When evaluated, a full-screen bottom sheet will appear with your component inside. You can make changes to the props or the component internals and re-evaluate the changed forms, after which the component will be re-mounted without running a reload (unless you save the file). Other times it's quicker to just hit save and the component will be reloaded as usual (except for the props you evaluated, which have to be re-evaluated when changed).
+
+> TIP: You can have multiple versions of the component as separate comments to check for the component variations
+
+> TIP: You can leave `comment` blocks at the end of component files (other than quo, since can be previewed in other ways) with usages of components, which other developers can use for visualisation/testing.

doc/decisions/0010-remove-jail-and-status-api.md

@@ -18,7 +18,7 @@ While neat in theory, it has some serious downsides:
   As a result of that, more dynamic/state requiring things (like the live tx detail in `/send` command messages) were very hard to do,
   so instead of "eating our own dogfood", we decided to side-step the API and implement such things as hard-coded logic in the app, while partly
   retaining the js code for "easier" things (like parameter declaration).
-  Needles to say, such efforts produced code of very poor quality, riddling our app with hard-coded "magic" everywhere in the codebase, completly
+  Needles to say, such efforts produced code of very poor quality, riddling our app with hard-coded "magic" everywhere in the codebase, completely
   defeating the point of "dogfooding" while still requiring more effort and being much more error prone (no way to unit test jail logic) because 
   of the need to asynchronously communicate with jail for leftover logic in command messages (the parts not hardcoded in app).
   

doc/decisions/0011-tweak-pr-process.md

@@ -13,7 +13,7 @@ accepted
 
 There was a generally dissatisfaction with our PR flow process from multiple stakeholders, including devs, QA and design. These largely centered around size, speed of integration and quality of PRs.
 
-For more details, please see pain points in the meeting notes held end of February here: https://notes.status.im/C5pj8g7gQOu9Wo8PtDZsMw?edit# as well as the preceeding Discuss thread: https://discuss.status.im/t/better-pull-requests-process/1044
+For more details, please see pain points in the meeting notes held end of February here: https://notes.status.im/C5pj8g7gQOu9Wo8PtDZsMw?edit# as well as the preceding Discuss thread: https://discuss.status.im/t/better-pull-requests-process/1044
 
 Also see conversations in Core Dev Call #12 and #13: https://github.com/status-im/pm/
 

doc/decisions/0013-tribute-to-talk.md

@@ -18,7 +18,7 @@ The whitepaper also proposes that the deposit is only forfeited to the recipient
 
 Considering:
 - the absence of efficient ways to perform anonymous transactions (zk-snarks could be used in the future for that)
-- the impossibility to prove that a recipient has made an actual reply and not some kind of automated reply (captcha solution was proposed, but wouldn't be pratical until we can use a solution such as swarm feeds that allow users to make free updates to their captcha without on-chain transactions)
+- the impossibility to prove that a recipient has made an actual reply and not some kind of automated reply (captcha solution was proposed, but wouldn't be practical until we can use a solution such as swarm feeds that allow users to make free updates to their captcha without on-chain transactions)
 - the limited time to develop the feature
 
 We opted for a solution that:
@@ -28,8 +28,8 @@ We opted for a solution that:
 
 ## Manifests
 
-Since TtT related informations aren't stored on chain, they need to be stored somewhere else.
-For the first iteration of TtT we opted for IPFS, which is already used accross the app for other forms of content, through Infura IPFS gateway.
+Since TtT related information aren't stored on chain, they need to be stored somewhere else.
+For the first iteration of TtT we opted for IPFS, which is already used across the app for other forms of content, through Infura IPFS gateway.
 
 On IPFS we store what we call a ttt manifest, which is a json file with the following format:
 

doc/export-icons.md

@@ -4,7 +4,7 @@
 
 ![](images/export-icons/export-icons.gif)
 
-1. Export from figma 2 pngs 2x and 3x put them in `./resources/images/icons`
+1. Export from figma 2 pngs 2x and 3x put them in `./resources/images/icons2`
 2. if necessary, rename file so that filename contains only lower case chars, e.g. `"Icon-Name@2x.png"` should be renamed to `"icon_name@2x.png"`.
 3. In the app `icon_name.png` still can be accessed as `icon-name`, so in order to use can add the next code:
     ```clojure

doc/how-to-launch-e2e.md

@@ -64,7 +64,7 @@ tests (otherwise some PRs could wait their turn of the scheduled Jenkins job til
 
 ## Analysing test results (and why test fails to pass)
 
-After automated test run finished test results could be found in GH comment (if the test suite ran agaist PR) and TestRail. There are two states of the test: Passed and Failed. Test failure happens when certain condition of test step has not met or automated test can not proceed execution because it can not find the respective element on screen it expects should be there.
+After automated test run finished test results could be found in GH comment (if the test suite ran against PR) and TestRail. There are two states of the test: Passed and Failed. Test failure happens when certain condition of test step has not met or automated test can not proceed execution because it can not find the respective element on screen it expects should be there.
 
 Several examples of when test fails to succeed:
 

doc/ide-setup.md

@@ -17,9 +17,10 @@ You can use any Clojure enabled editor. Here are instructions for developing the
   - [REPL!](#repl)
     - [Connecting to REPL to IntelliJ](#connecting-to-repl-to-intellij)
     - [Connecting REPL and IntelliJ to `status-mobile`](#connecting-repl-and-intellij-to-status-mobile)
-- [Using Calva](#using-calva)
-  - [Start and connect the REPL](#start-and-connect-the-repl)
-  - [Use the REPL](#use-the-repl)
+- [Visual Studio Code](#visual-studio-code)
+  - [Set up the REPL](#set-up-the-repl)
+  - [Auto-format files on save](#auto-format-files-on-save)
+- [Using Emacs with CIDER](#using-emacs-with-cider)
 
 ## Using Cursive
 
@@ -160,24 +161,24 @@ Following the above should give you the below result:
 
 For additional details on issues you may face when setting up REPL with Cursive [see this document](https://notes.status.im/9Gr7kqF8SzC_SmYK0eB7uQ?view#Connecting-Cursive--IntelliJ-IDEA-to-REPL-Problems)
 
-## Using Calva
+## Visual Studio Code
 
-For VS Code users.
+### Set up the REPL
 
-0. Install Calva.
+1. Install Calva extension.
+2. Open the `status-mobile` folder.
+3. Start [Status development](starting-guide.md#development) (Starting the
+   `run-clojure` and `run-metro` jobs in split view in the VS Code integrated
+   terminal works great).
+4. Run the VS Code command: **Calva: Connect to a running REPL Server in the
+   project**.
+   - Select the project type `shadow-cljs`.
+   - Accept the suggested connection `host:port`.
+   - Select to connect to the `:mobile` build.
 
-### Start and connect the REPL
-
-1. Open the `status-mobile` folder.
-1. Start [Status development](starting-guide.md#development) (Starting the `run-clojure` and `run-metro` jobs in split view in the VS Code integrated terminal works great.)
-1. Run the VS Code command: **Calva: Connect to a running REPL Server in the project**
-   1. Select the project type `shadow-cljs`
-   1. Accept the suggested connection `host:port`
-   1. Select to connect to the `:mobile` build
-
-### Use the REPL
-
-Open any `.cljs` file in the project and evaluate forms in it. See https://calva.io/try-first/ for some starter tips and links. Confirm that your REPL is connected to the app by evaluating:
+Open any `.cljs` file in the project and evaluate forms in it. See
+https://calva.io/try-first/ for some starter tips and links. Confirm that your
+REPL is connected to the app by evaluating:
 
 ```clojure
 (js/alert "Hello from Status App!")
@@ -185,9 +186,35 @@ Open any `.cljs` file in the project and evaluate forms in it. See https://calva
 
 🎉 Tada! You are ready to use the REPL to improve Status.im! 🎉
 
-Please consider bookmarking [calva.io](https://calva.io/) for quick access to the Calva documentation. 
+Consider bookmarking [calva.io](https://calva.io/) for quick access to the Calva
+documentation.
 
-## Using Emacs/Cider
+### Auto-format files on save
+
+We format Clojure code with [zprint](https://github.com/kkinnear/zprint). We
+recommend configuring VSCode to auto-format Clojure files on every save,
+otherwise you'll need to constantly rely on the much slower `make lint-fix`
+command.
+
+1. Create a file `~/.zprintrc` and enable the `:search-config?` option. This is
+   necessary so the VSCode extension finds the project's `.zprintrc`.
+
+```bash
+echo "{:search-config? true}" > ~/.zprintrc
+```
+
+2. Install the extension
+   [vscode-clj-zprint](https://github.com/rflagreca/vscode-clj-zprint). By the
+   way, did you know this extension is written in ClojureScript?
+3. Copy the recommended settings from our repository in
+   [.vscode/settings.example.json](/.vscode/settings.example.json) and merge it
+   with your workspace settings in `.vscode/settings.json`.
+
+The extension `vscode-clj-zprint` is only available for VSCode. If you are using
+VSCodium, you'll need to build the `vsix` (extension) yourself (it's easy, only
+`yarn` and `vsce` are required).
+
+## Using Emacs with CIDER
 
 1. Install Emacs/Cider/etc. (there is a lot of variability in how to manage things in emacs, so please google for help with this)
 2. Add a local ~/.shadow-cljs/config.edn file like below (corresponding to the version numbers of the packages you are using):
@@ -198,5 +225,3 @@ Please consider bookmarking [calva.io](https://calva.io/) for quick access to th
   [cider/cider-nrepl "0.28.4"]
   [cider/piggieback "0.5.2"]]}
 ```
-
-

doc/new-guidelines.md

@@ -76,7 +76,7 @@ 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)
+Ideally, the prop names for components (particularly in quo 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.
@@ -134,7 +134,7 @@ For example if Figma has sizes `:small`, `:medium` and `:large`
 
 Prefer to define styles in a separate file named `style.cljs`, colocated with
 the source file. For a real example, see
-[src/quo2/components/record_audio/record_audio/style.cljs](../src/quo2/components/record_audio/record_audio/style.cljs).
+[src/quo/components/record_audio/record_audio/style.cljs](../src/quo/components/record_audio/record_audio/style.cljs).
 
 ```clojure
 ;; bad
@@ -467,9 +467,9 @@ Prefer the pure version of `:json-rpc/call` (no callbacks).
 
 ### Registering event handlers
 
-Register events with `re-frame.core/reg-event-fx` and follow [re-frame's best
+Register events with `utils.re-frame/reg-event-fx` and follow [re-frame's best
 practice](https://github.com/day8/re-frame/blob/39adca93673f334dc751ee2d99d340b51a9cc6db/docs/FAQs/BestPractice.md#use-the-fx-effect)
-so use only `:db` and `:fx` effects. `rf/merge` is deprecated and should not be
+so use only `:db` and `:fx` effects. `utils.re-frame/merge` and `utils.re-frame/defn` are deprecated and should not be
 used in the new code in `src/status_im2/`. Don't use
 `re-frame.core/reg-event-db`.
 
@@ -528,27 +528,27 @@ due to performance constraints.
    (:preferred-name multiaccount)))
 ```
 
-### Requiring quo2 components
+### Requiring quo components
 
-Consume `quo2` components from `quo2.core`, unless the namespace is also inside
-the `quo2/` directory.
+Consume `quo` components from `quo.core`, unless the namespace is also inside
+the `quo/` directory.
 
 ```clojure
 ;; bad
 (ns my-namespace
-  (:require [quo2.components.icon :as icon]))
+  (:require [quo.components.icon :as icon]))
 
 (icon/icon :i/verified)
 
 ;; good
 (ns my-namespace
-  (:require [quo2.core :as quo]))
+  (:require [quo.core :as quo]))
 
 (quo/icon :i/verified)
 
-;; also good because both namespaces are inside quo2/
-(ns quo2.components.tabs.account-selector
-  (:require [quo2.components.markdown.text :as text]))
+;; also good because both namespaces are inside quo/
+(ns quo.components.tabs.account-selector
+  (:require [quo.components.markdown.text :as text]))
 ```
 
 ### Require/import
@@ -615,12 +615,12 @@ Use the appropriate keyword qualification/namespace.
 
 ```clojure
 ;; bad
-(require '[quo2.components.icon :as icons])
+(require '[quo.components.icon :as icons])
 (icons/icon :main-icons2/verified)
 
 ;; good
-(require '[quo2.core :as quo2])
-(quo2/icon :i/verified)
+(require '[quo.core :as quo])
+(quo/icon :i/verified)
 ```
 
 ### Translations
@@ -695,7 +695,7 @@ First, the bird's-eye view with some example ClojureScript files:
 src
 ├── js/
 ├── mocks/
-├── quo2
+├── quo
 │   ├── components/
 │   ├── foundations/
 │   └── theme.cljs
@@ -716,7 +716,7 @@ src
 
 - `src/js`: Raw Javascript files, e.g. React Native Reanimated worklets.
 - `src/mocks`: Plumbing configuration to be able to run tests.
-- `src/quo2/`: The component library for Status Mobile.
+- `src/quo/`: The component library for Status Mobile.
 - `src/react_native/`: Contains only low-level constructs to help React Native
   work in tandem with Clojure(Script).
 - `src/status_im2/`: Directory where we try to be as strict as possible about
@@ -728,7 +728,7 @@ src
   of the directory tree. Just like directories named `utils`, their directory
   nesting level communicates their applicable limits.
 - `src/status_im2/common/components/`: Contains reusable components that are not
-  part of the design system (quo2).
+  part of the design system (quo).
 - `src/status_im2/contexts/`: Contains [bounded contexts](#glossary), like
   `browser/`, `messaging/`, etc. As much as possible, _bounded contexts_ should
   not directly require each other's namespaces.
@@ -743,9 +743,9 @@ directory nesting level precisely indicates its boundaries. For example, a
 `contexts/user_settings/utils/datetime.cljs` file communicates that it should
 only be used in the `user_settings` context.
 
-### src/quo2
+### src/quo
 
-The `src/quo2/` directory holds all components for the new design system. As
+The `src/quo/` directory holds all components for the new design system. As
 much as possible, its sub-directories and component names should reflect the
 same language used by designers.
 
@@ -753,14 +753,14 @@ Even though the directory lives alongside the rest of the codebase, we should
 think of it as an external entity that abstracts away particular Status domain
 knowledge.
 
-Components inside `src/quo2/` should not rely on re-frame, i.e. they should not
+Components inside `src/quo/` should not rely on re-frame, i.e. they should not
 dispatch events or use subscriptions.
 
 Example structure:
 
 ```
 src
-└── quo2
+└── quo
     ├── components
     │   └── dropdown
     │       ├── style.cljs

doc/patching.md

@@ -1,7 +1,7 @@
 # Patching
 
 ## Libraries
-If 3rd party library has an issue and fix is not yet released (or we can't switch to a new release), we use forks. Fix should be commited to the fork, tagged and referenced from package.json.
+If 3rd party library has an issue and fix is not yet released (or we can't switch to a new release), we use forks. Fix should be committed to the fork, tagged and referenced from package.json.
 
 Example: [`react-native-hole-view`](https://github.com/status-im/react-native-hole-view#refs/tags/v2.1.1-status)
 

doc/pixel-perfection.md

@@ -1,16 +1,22 @@
 # Pixel Perfection
 The Status Mobile team aims to align the design implementation perfectly according to a given screens respective Figma design spec.
 
-Currently the Figma Designs match up with an "iPhone 11 Pro" screen size. 
+Currently, the Figma Designs match up with both "iPhone 11 Pro" and "iPhone 13" screen size.
+
+The Dimension reference for iPhone 11 Pro is 375 x 812 (width x height) and for iPhone 13 is 390 x 844.
 
 To test your implementation is correct you can take the following steps
 
 - Open a new Figma file so that you have write privileges. 
+
 - Copy in the component or screen from the Figma file.
 
-- Using the "iPhone 11 Pro" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.
+- Using the "iPhone 11 Pro" or the "iPhone 13" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.
+
+- To get the right size, set your screenshot to width according to your simulator: 
+  - for iPhone 13 set 390
+  - for iPhone 11 Pro set 375
 
-- To get the right size, set your screenshot to width 375px
 
 ![](images/pixel-perfection/layer-width.png)
 

doc/post-mortem.md

@@ -13,7 +13,7 @@ QA process was focused on account creation and login with keycard, and this bug
 
 ## Resolution process
 
-- the commit was reverted locally by the developer which fixed the issue localy and confirmed the faulty commit
+- the commit was reverted locally by the developer which fixed the issue locally and confirmed the faulty commit
 - the bug was only reproducible on iOS which strongly hinted at a potential issue with native code
 - the missing method was not the origin of the problem but was found at this point and further analysis lead to the shadowing error
 

doc/starting-guide.md

@@ -30,23 +30,23 @@ You need to have an emulator like [AVD](https://developer.android.com/studio/run
 
 #### Running on a simulator
 
-We highly recommend using the `iPhone 11 Pro` simulator as its screen dimensions match with our design.
+We highly recommend using either the `iPhone 11 Pro` or `iPhone 13` simulator as its screen dimensions match with our design.
 
-If you have Xcode `v12.x` (and above) installed in your system, you need to follow the below steps to add `iPhone 11 Pro` simulator:
+If you have Xcode `v12.x` (and above) installed in your system, you need to follow the below steps to add `iPhone 13` simulator:
 
 1. Open Xcode
 2. Menu `>` Window `>` Devices and Simulators
 3. Tap `+` button on bottom left
-4. Select **Device Type** as `iPhone 11 Pro`
+4. Select **Device Type** as `iPhone 13`
 5. Leave the **Simulator Name** empty and tap on **Create**
 
 ##### NOTE ⚠️
 
-Running `make run-ios` will target `iPhone 11 Pro` by default.
+Running `make run-ios` will target `iPhone 13` by default.
 
 If you need to run on any other simulator, you can specify the simulator type by adding the `SIMULATOR` flag:
 ```sh
-make run-ios SIMULATOR="iPhone 11 Pro"
+make run-ios SIMULATOR="iPhone 13"
 ```
 
 #### Running on a physical device

doc/status-go-changes.md

@@ -0,0 +1,31 @@
+# How to make changes to status-go
+
+
+## Overview
+
+To make changes to status-go, the best approach is to first identify the issue/feature and the changes to be made directly in status-go.
+For any bugs we want to most likely write a failing test in status-go, and make sure that it passes, before we test on mobile.
+
+Once you are quite confident that the status-go code is ready to be tested on mobile, you can test it locally by running the following command:
+
+```
+env STATUS_GO_SRC_OVERRIDE={your-status-go-directory} make run-{android/ios}
+```
+
+This will recompile status-go and run status-mobile on your device with that updated status-go version.
+
+Once you have tested the status-go changes locally and you think it's ready for a PR:
+
+1) Create a PR in status-go
+
+2) Point your local status-mobile branch to that PR by running the script:
+
+```
+scripts/update-status-go.sh {status-go-branch-name}
+```
+
+This will update `status-go-version.json`
+
+Commit updated status-go-version.json and create a status-mobile PR
+
+Once both PRs have been approved and are good to merge, you can follow the [merge guidelines](./merging-pr-process.md)

ios/Podfile

@@ -12,6 +12,15 @@ production = ENV["PRODUCTION"] == "1"
 # TODO: remove this flag once you upgrade react-native above version 0.70
 ENV['USE_CODEGEN_DISCOVERY'] = "1"
 
+# If inside a Nix shell, allow pod install
+inside_nix_shell = ENV['IN_NIX_SHELL']
+allow_pod_install = !inside_nix_shell.nil?
+
+unless allow_pod_install
+    puts "ERROR: 'pod install' must be run inside a Nix shell. Please ensure you're inside a nix shell and try again."
+    exit 1
+end
+
 abstract_target 'Status' do
   # Pods for StatusQuo
   config = use_native_modules!
@@ -33,7 +42,6 @@ abstract_target 'Status' do
   pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'
   pod 'react-native-config', :path => '../node_modules/react-native-config'
 
-  pod 'SQLCipher', '~>3.0'
   pod 'SSZipArchive', '2.4.3'
 
   permissions_path = '../node_modules/react-native-permissions/ios'
@@ -67,6 +75,13 @@ abstract_target 'Status' do
         # TODO : remove after upgrading to react-native 0.72.x
         config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
       end
+      # We need to remove the predefinition of IPHONEOS_DEPLOYMENT_TARGET from RNCK lib to use our own.
+      case target.name
+      when 'ReactNativeCameraKit'
+        target.build_configurations.each do |config|
+          config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+        end
+      end
     end
   end
 

ios/Podfile.lock

@@ -247,7 +247,7 @@ PODS:
     - React-Core
   - react-native-blur (4.3.3):
     - React-Core
-  - react-native-cameraroll (4.0.4):
+  - react-native-cameraroll (5.10.0):
     - React-Core
   - react-native-config (1.5.0):
     - react-native-config/App (= 1.5.0)
@@ -346,7 +346,7 @@ PODS:
     - React-perflogger (= 0.69.10)
   - ReactNativeAudioToolkit (2.0.3):
     - React
-  - ReactNativeCameraKit (13.0.0):
+  - ReactNativeCameraKit (14.0.0-beta13):
     - React-Core
   - ReactNativeNavigation (7.27.1):
     - HMSegmentedControl
@@ -434,11 +434,6 @@ PODS:
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.10)
   - secp256k1 (0.1.6)
-  - SQLCipher (3.4.2):
-    - SQLCipher/standard (= 3.4.2)
-  - SQLCipher/common (3.4.2)
-  - SQLCipher/standard (3.4.2):
-    - SQLCipher/common
   - SSZipArchive (2.4.3)
   - TOCropViewController (2.6.1)
   - TouchID (4.4.1):
@@ -473,7 +468,7 @@ DEPENDENCIES:
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
-  - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
+  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
   - react-native-config (from `../node_modules/react-native-config`)
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
   - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
@@ -520,7 +515,6 @@ DEPENDENCIES:
   - RNStaticSafeAreaInsets (from `../node_modules/react-native-static-safe-area-insets`)
   - RNSVG (from `../node_modules/react-native-svg`)
   - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
-  - SQLCipher (~> 3.0)
   - SSZipArchive (= 2.4.3)
   - TouchID (from `../node_modules/react-native-touch-id`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -533,7 +527,6 @@ SPEC REPOS:
     - libwebp
     - SDWebImage
     - SDWebImageWebPCoder
-    - SQLCipher
     - SSZipArchive
     - TOCropViewController
 
@@ -591,7 +584,7 @@ EXTERNAL SOURCES:
   react-native-blur:
     :path: "../node_modules/@react-native-community/blur"
   react-native-cameraroll:
-    :path: "../node_modules/@react-native-community/cameraroll"
+    :path: "../node_modules/@react-native-camera-roll/camera-roll"
   react-native-config:
     :path: "../node_modules/react-native-config"
   react-native-image-resizer:
@@ -707,7 +700,7 @@ SPEC CHECKSUMS:
   FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991
   FBReactNativeSpec: 1b2309b096448a1dc9d0c43999216f8fda809ae8
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 166d178815c300e8126de9a7900101814eb16253
+  glog: d93527a855523adb8c113837db4be68fb00e230d
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -730,7 +723,7 @@ SPEC CHECKSUMS:
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
-  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
+  react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-lottie-splash-screen: 068688c15dd478301fda00f8d87d7fb7d5b9a93e
@@ -757,7 +750,7 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: 5ebf1ddaa706bf2986123f22d2cad905443c2c5f
   ReactCommon: 65754b8932ea80272714988268bbfb9f303264a5
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeCameraKit: 9d46a5d7dd544ca64aa9c03c150d2348faf437eb
+  ReactNativeCameraKit: d95d3e19c514526a234d9f93c6db7e7f10eef9ea
   ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
   RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
   RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
@@ -772,19 +765,18 @@ SPEC CHECKSUMS:
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: 43adb0307a62c1ce9694f36f124ca3b51a15272a
+  RNReanimated: 42f56dc5c032a11177b9ea12cdb57285318b432e
   RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
   RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
-  SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: d24d6184b6b85f742536bd93bd07d69d7b9bb4c1
 
-PODFILE CHECKSUM: ac30a0172ff0126b6f307c20f34c47ce0ebf278f
+PODFILE CHECKSUM: 84b749023e1c988c133d7a6ec09d125536e4a4fd
 
 COCOAPODS: 1.12.0

ios/StatusIm/Info.plist

@@ -33,7 +33,7 @@
 			<string>im.status.ethereum.applink</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>status-im</string>
+				<string>status-app</string>
 			</array>
 		</dict>
 		<dict>

ios/StatusIm/StatusIm.entitlements

@@ -11,7 +11,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:join.status.im</string>
+		<string>applinks:status.app</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>

ios/StatusImPR/Info.plist

@@ -29,7 +29,7 @@
 			<string>im.status.ethereum.applink</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>status-im</string>
+				<string>status-app</string>
 			</array>
 		</dict>
 		<dict>

ios/StatusImPR/StatusImPR.entitlements

@@ -11,7 +11,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:join.status.im</string>
+		<string>applinks:status.app</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>

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

@@ -1194,21 +1194,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         return getPublicStorageDirectory().getAbsolutePath();
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String generateAlias(final String seed) {
-        return Statusgo.generateAlias(seed);
-    }
-
-    @ReactMethod
-    public void generateAliasAsync(final String seed, final Callback callback) throws JSONException {
-        executeRunnableStatusGoMethod(() -> Statusgo.generateAlias(seed), callback);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String identicon(final String seed) {
-        return Statusgo.identicon(seed);
-    }
-
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String encodeTransfer(final String to, final String value) {
         return Statusgo.encodeTransfer(to, value);
@@ -1269,31 +1254,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.identicon(seed), callback);
     }
 
-    @ReactMethod
-    public void generateAliasAndIdenticonAsync(final String seed, final Callback callback) {
-
-         Log.d(TAG, "generateAliasAndIdenticonAsync");
-                if (!checkAvailability()) {
-                    callback.invoke(false);
-                    return;
-                }
-
-                Runnable r = new Runnable() {
-                    @Override
-                    public void run() {
-                        String resIdenticon = Statusgo.identicon(seed);
-                        String resAlias = Statusgo.generateAlias(seed);
-
-                        Log.d(TAG, resIdenticon);
-                        Log.d(TAG, resAlias);
-                        callback.invoke(resAlias, resIdenticon);
-                    }
-                };
-
-                StatusThreadPoolExecutor.getInstance().execute(r);
-
-    }
-
     @Override
     public @Nullable
     Map<String, Object> getConstants() {

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

@@ -880,10 +880,6 @@ RCT_EXPORT_METHOD(callRPC:(NSString *)payload
     });
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(generateAlias:(NSString *)publicKey) {
-  return StatusgoGenerateAlias(publicKey);
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(keystoreDir) {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *rootUrl =[[fileManager
@@ -943,19 +939,6 @@ RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
     callback(@[initResult]);
 }
 
-RCT_EXPORT_METHOD(generateAliasAsync:(NSString *)publicKey
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"generateAliasAsync() method called");
-#endif
-    NSString *result = StatusgoGenerateAlias(publicKey);
-    callback(@[result]);
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(identicon:(NSString *)publicKey) {
-  return StatusgoIdenticon(publicKey);
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(encodeTransfer:(NSString *)to
                                        value:(NSString *)value) {
   return StatusgoEncodeTransfer(to,value);
@@ -1011,15 +994,6 @@ RCT_EXPORT_METHOD(validateMnemonic:(NSString *)seed
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(identiconAsync:(NSString *)publicKey
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"identiconAsync() method called");
-#endif
-    NSString *result = StatusgoIdenticon(publicKey);
-    callback(@[result]);
-}
-
 RCT_EXPORT_METHOD(createAccountAndLogin:(NSString *)request) {
 #if DEBUG
     NSLog(@"createAccountAndLogin() method called");
@@ -1034,16 +1008,6 @@ RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
     StatusgoRestoreAccountAndLogin(request);
 }
 
-RCT_EXPORT_METHOD(generateAliasAndIdenticonAsync:(NSString *)publicKey
-                  callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"generateAliasAndIdenticonAsync() method called");
-#endif
-    NSString *identiconResult = StatusgoIdenticon(publicKey);
-    NSString *aliasResult = StatusgoGenerateAlias(publicKey);
-    callback(@[aliasResult, identiconResult]);
-}
-
 RCT_EXPORT_METHOD(callPrivateRPC:(NSString *)payload
                   callback:(RCTResponseSenderBlock)callback) {
     dispatch_async( dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{

modules/react-native-status/nodejs/status.cpp

@@ -354,38 +354,6 @@ void _StopCPUProfiling(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _Identicon(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for Identicon")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'pk'")));
-		return;
-	}
-
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = Identicon(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-}
-
 void _EncodeTransfer(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -864,38 +832,6 @@ void _CreateAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _GenerateAlias(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-        Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for GenerateAlias")));
-		return;
-	}
-
-	// Check the argument types
-
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'pk'")));
-		return;
-	}
-
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = GenerateAlias(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-
-}
-
 void _ValidateMnemonic(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1953,7 +1889,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
-	NODE_SET_METHOD(exports, "identicon", _Identicon);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);
 	NODE_SET_METHOD(exports, "decodeParameters", _DecodeParameters);
@@ -1968,7 +1903,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "resetChainData", _ResetChainData);
 	NODE_SET_METHOD(exports, "saveAccountAndLogin", _SaveAccountAndLogin);
 	NODE_SET_METHOD(exports, "createAccountAndLogin", _CreateAccountAndLogin);
-	NODE_SET_METHOD(exports, "generateAlias", _GenerateAlias);
 	NODE_SET_METHOD(exports, "validateMnemonic", _ValidateMnemonic);
 	NODE_SET_METHOD(exports, "multiformatSerializePublicKey", _MultiformatSerializePublicKey);
 	NODE_SET_METHOD(exports, "saveAccountAndLoginWithKeycard", _SaveAccountAndLoginWithKeycard);

nix/deps/clojure/README.md

@@ -12,12 +12,13 @@ By using the following command:
 ```sh
 shadow-cljs classpath --force-spawn
 ```
-We both download the necessary JARs and POMs into `~/.m2` folder, but also get the classpath printed into standard output.
+We download the necessary JARs into `~/.m2` folder, but also get the classpath printed into standard output.
+We skip POM files since they are not necessary, and add edge cases we don't want to handle.
 
 We then use the classpath in combination with contents of `~/.m2` folder to generate the following files:
 
 * `deps.list` - List of JARs relative to the `~/.m2` cache folder.
-* `deps.json` - Full list of JARs and POMs including their SHAs.
+* `deps.json` - Full list of JARs including their SHAs.
 
 The `deps.list` file is just intermediate and for debugging purposes.
 The `deps.json` is loaded by the derivation in [`default.nix`](./default.nix) and used to produce a derivation that contains all the necessary dependencies:

nix/deps/clojure/default.nix

@@ -8,9 +8,6 @@ let
   # load dependencies
   deps = importJSON ./deps.json;
 
-  # some .jar files have an `-aot` suffix that doesn't work for .pom files
-  getPOM = jarUrl: "${removeSuffix "-aot" jarUrl}.pom";
-
   script = writeShellScriptBin "create-local-maven-repo" (''
     mkdir -p $out
     cd $out
@@ -18,18 +15,11 @@ let
   (concatMapStrings (dep: 
     let
       url = "${dep.host}/${dep.path}";
-      pom = {
-        sha1 = attrByPath [ "pom" "sha1" ] "" dep;
-        sha256 = attrByPath [ "pom" "sha256" ] "" dep;
-      };
-      pom-download = optionalString (pom.sha256 != "") (
-        fetchurl { url = getPOM url; inherit (pom) sha256; }
-      );
       jar = {
         sha1 = attrByPath [ "jar" "sha1" ] "" dep;
         sha256 = attrByPath [ "jar" "sha256" ] "" dep;
       };
-      jar-download = optionalString (jar.sha256 != "") (
+      jarFile = optionalString (jar.sha256 != "") (
         fetchurl { url = "${url}.jar"; inherit (jar) sha256; }
       );
       fileName = last (splitString "/" dep.path);
@@ -38,14 +28,8 @@ let
       ''
         mkdir -p ${directory}
 
-        ${optionalString (pom-download != "") ''
-        ln -s "${pom-download}" "${getPOM dep.path}"
-        ''}
-        ${optionalString (pom.sha1 != "") ''
-        echo "${pom.sha1}" > "${getPOM dep.path}.sha1"
-        ''}
-        ${optionalString (jar-download != "") ''
-        ln -s "${jar-download}" "${dep.path}.jar"
+        ${optionalString (jarFile != "") ''
+        ln -s "${jarFile}" "${dep.path}.jar"
         ''}
         ${optionalString (jar.sha1 != "") ''
         echo "${jar.sha1}" > "${dep.path}.jar.sha1"

nix/deps/clojure/deps.list

@@ -1,89 +1,102 @@
+args4j/args4j/2.33/args4j-2.33.jar
+babashka/fs/0.2.16/fs-0.2.16.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
+borkdude/edamame/1.1.17/edamame-1.1.17.jar
+borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
+cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
 cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
 cider/piggieback/0.5.2/piggieback-0.5.2.jar
-cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
+clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
+cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
-com/cognitect/transit-clj/1.0.324/transit-clj-1.0.324.jar
-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/cognitect/transit-clj/1.0.329/transit-clj-1.0.329.jar
+com/cognitect/transit-cljs/0.8.280/transit-cljs-0.8.280.jar
+com/cognitect/transit-java/1.0.362/transit-java-1.0.362.jar
+com/cognitect/transit-js/0.8.874/transit-js-0.8.874.jar
+com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3.jar
+com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.13.3/jackson-dataformat-cbor-2.13.3.jar
+com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.13.3/jackson-dataformat-smile-2.13.3.jar
+com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
+com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
+com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+com/google/code/gson/gson/2.9.1/gson-2.9.1.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
+com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
+com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
+com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
+com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
+com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411.jar
+com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
+com/google/re2j/re2j/1.3/re2j-1.3.jar
+commons-codec/commons-codec/1.15/commons-codec-1.15.jar
 commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.6/commons-io-2.6.jar
+commons-io/commons-io/2.11.0/commons-io-2.11.0.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
-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
+com/taoensso/encore/3.68.0/encore-3.68.0.jar
+com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
+com/taoensso/truss/1.11.0/truss-1.11.0.jar
+com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
+crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
+crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
-edn-query-language/eql/0.0.9/eql-0.0.9.jar
-expound/expound/0.8.5/expound-0.8.5.jar
-fipp/fipp/0.6.23/fipp-0.6.23.jar
+expound/expound/0.9.0/expound-0.9.0.jar
+fipp/fipp/0.6.26/fipp-0.6.26.jar
 hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
-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/aviso/pretty/1.4.4/pretty-1.4.4.jar
+io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1.jar
+io/replikativ/datalog-parser/0.2.25/datalog-parser-0.2.25.jar
 io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
+javax/annotation/jsr250-api/1.0/jsr250-api-1.0.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
+net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
+nrepl/bencode/1.1.0/bencode-1.1.0.jar
 nrepl/nrepl/1.0.0/nrepl-1.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/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
-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/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.cli/1.0.194/tools.cli-1.0.194.jar
+org/apache/ant/ant/1.10.11/ant-1.10.11.jar
+org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
+org/babashka/sci/0.7.38/sci-0.7.38.jar
+org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
+org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
+org/clojure/clojure/1.11.1/clojure-1.11.1.jar
+org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
+org/clojure/core.async/1.5.648/core.async-1.5.648.jar
+org/clojure/core.cache/1.0.225/core.cache-1.0.225.jar
+org/clojure/core.memoize/1.0.253/core.memoize-1.0.253.jar
+org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
+org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
+org/clojure/data.json/2.4.0/data.json-2.4.0.jar
+org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
+org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
+org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
+org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
+org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
+org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.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/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-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
+org/clojure/tools.reader/1.3.6/tools.reader-1.3.6.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
 org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar
 org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final.jar
 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/jspecify/jspecify/0.2.0/jspecify-0.2.0.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/9.4/asm-9.4.jar
+org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.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
@@ -91,13 +104,11 @@ 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
 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
+ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
+ring/ring-core/1.9.6/ring-core-1.9.6.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-cljsjs/0.0.21/shadow-cljsjs-0.0.21.jar
-thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0.jar
+thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot.jar
+thheller/shadow-cljsjs/0.0.22/shadow-cljsjs-0.0.22.jar
+thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1.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
+tigris/tigris/0.1.2/tigris-0.1.2.jar

nix/deps/clojure/generate.sh

@@ -53,8 +53,6 @@ function nix_entry_from_jar() {
     JAR_PATH="${MAVEN_CACHE_PATH}/${JAR_REL_PATH}"
     JAR_NAME=$(basename "${JAR_PATH}")
     JAR_DIR=$(dirname "${JAR_PATH}")
-    # POM might have a slightly different name
-    POM_PATH=$(echo ${JAR_DIR}/*.pom)
 
     REPO_NAME=$(get_repo_for_dir "${JAR_DIR}")
     REPO_URL=${REPOS[${REPO_NAME}]}
@@ -62,18 +60,11 @@ function nix_entry_from_jar() {
     JAR_SHA1=$(cat "${JAR_PATH}.sha1")
     JAR_SHA256=$(get_nix_sha "${JAR_PATH}")
 
-    POM_SHA1=$(cat "${POM_PATH}.sha1")
-    POM_SHA256=$(get_nix_sha "${POM_PATH}")
-    
     # Format into a Nix attrset entry
     echo -n "
   {
     \"path\": \"${JAR_REL_NAME}\",
     \"host\": \"${REPO_URL}\",
-    \"pom\": {
-      \"sha1\": \"${POM_SHA1}\",
-      \"sha256\": \"${POM_SHA256}\"
-    },
     \"jar\": {
       \"sha1\": \"${JAR_SHA1}\",
       \"sha256\": \"${JAR_SHA256}\"

nix/deps/gradle/deps.list

@@ -117,7 +117,7 @@ commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.1.1
 commons-logging:commons-logging:1.2
-com.adobe.xmp:xmpcore:6.0.6
+com.adobe.xmp:xmpcore:6.1.11
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
@@ -444,7 +444,7 @@ com.diffplug.durian:durian-io:1.2.0
 com.diffplug.spotless:spotless-lib-extra:2.30.0
 com.diffplug.spotless:spotless-lib:2.30.0
 com.diffplug.spotless:spotless-plugin-gradle:6.11.0
-com.drewnoakes:metadata-extractor:2.12.0
+com.drewnoakes:metadata-extractor:2.18.0
 com.facebook.conceal:conceal:1.1.3
 com.facebook.fbjni:fbjni-java-only:0.2.2
 com.facebook.fresco:animated-base:2.5.0
@@ -715,11 +715,13 @@ org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
+org.jetbrains.kotlinx:atomicfu:0.16.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
@@ -823,5 +825,6 @@ org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 com.android.tools.lint:lint-gradle:30.2.2
-com.android.tools.build:gradle:7.0.4
+com.android.tools.build:gradle:7.0.4

nix/deps/gradle/deps.urls

@@ -498,7 +498,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.0/commons-
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.0.6/xmpcore-6.0.6.pom
+https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/airbnb/android/lottie/3.4.4/lottie-3.4.4.pom
@@ -563,7 +563,7 @@ https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-io/1.2.0/durian-
 https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extra/2.30.0/spotless-lib-extra-2.30.0.pom
 https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.30.0/spotless-lib-2.30.0.pom
 https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-gradle/6.11.0/spotless-plugin-gradle-6.11.0.pom
-https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.12.0/metadata-extractor-2.12.0.pom
+https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.18.0/metadata-extractor-2.18.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni-java-only/0.2.2/fbjni-java-only-0.2.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-base/2.5.0/animated-base-2.5.0.pom
@@ -593,25 +593,25 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.3/soloader-0.10.3.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.15.2/jackson-annotations-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.0-rc1/jackson-annotations-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.0-rc1/jackson-core-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.0-rc1/jackson-databind-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.15.2/jackson-base-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.16.0-rc1/jackson-base-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.15.2/jackson-bom-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.16.0-rc1/jackson-bom-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.15/jackson-parent-2.15.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.16-rc1/jackson-parent-2.16-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.15.2/jackson-modules-base-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.16.0-rc1/jackson-modules-base-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.15.2/jackson-module-jaxb-annotations-2.15.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.16.0-rc1/jackson-module-jaxb-annotations-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/50/oss-parent-50.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/55/oss-parent-55.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -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.3/auto-value-annotations-1.10.3.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.4/auto-value-annotations-1.10.4.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.3/auto-value-parent-1.10.3.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.4/auto-value-parent-1.10.4.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
@@ -665,7 +665,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.21.1/error_prone_annotations-2.21.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -673,7 +673,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.4/error_prone_parent-2.3.4.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.4.0/error_prone_parent-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.21.1/error_prone_parent-2.21.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.23.0/error_prone_parent-2.23.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -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.2-jre/guava-parent-32.1.2-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.1.2-jre/guava-testlib-32.1.2-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/32.1.3-jre/guava-parent-32.1.3-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.1.3-jre/guava-testlib-32.1.3-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.2-jre/guava-32.1.2-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/32.1.3-jre/guava-32.1.3-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.5.0/okio-jvm-3.5.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.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.5.0/okio-3.5.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.6.0/okio-3.6.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
@@ -771,26 +771,26 @@ https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.2.0/istack-
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.2/jaxb-bom-ext-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.3/jaxb-bom-ext-4.0.3.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.4/jaxb-bom-ext-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.3.2/jaxb-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.3/jaxb-parent-4.0.3.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.4/jaxb-parent-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/jaxb-runtime-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.2/jaxb-runtime-parent-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb-txw-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.2/jaxb-txw-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.3/jaxb-txw-parent-4.0.3.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.4/jaxb-txw-parent-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.1.0/FastInfoset-2.1.0.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.1.1/FastInfoset-2.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.15/fastinfoset-project-1.2.15.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.16/fastinfoset-project-1.2.16.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.1.0/fastinfoset-project-2.1.0.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.1.1/fastinfoset-project-2.1.1.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.9.0/antlr4-annotations-4.9.0.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.5/antlr4-master-4.5.pom
@@ -855,9 +855,9 @@ https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/1
 https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.pom
 https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/2.3.2/jakarta.xml.bind-api-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0/jakarta.xml.bind-api-parent-4.0.0.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.1/jakarta.xml.bind-api-parent-4.0.1.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.1/jakarta.xml.bind-api-4.0.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.pom
 https://repo.maven.apache.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.pom
@@ -872,11 +872,11 @@ https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.6/byte-buddy-agent-1.14.6.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.8/byte-buddy-agent-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.6/byte-buddy-parent-1.14.6.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.8/byte-buddy-parent-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.6/byte-buddy-1.14.6.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.8/byte-buddy-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -991,7 +991,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.38.0/checker-qual-3.38.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.39.0/checker-qual-3.39.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
@@ -1031,42 +1031,45 @@ https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.1.20
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.2/jaxb-bom-2.3.2.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.3/jaxb-bom-4.0.3.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.4/jaxb-bom-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.3/jaxb-core-4.0.3.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.4/jaxb-core-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.3/txw2-4.0.3.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.4/txw2-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.7/org.jacoco.agent-0.8.7.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.10/org.jacoco.agent-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.11/org.jacoco.agent-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.ant/0.8.7/org.jacoco.ant-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.7/org.jacoco.build-0.8.7.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.10/org.jacoco.build-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.11/org.jacoco.build-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.7/org.jacoco.core-0.8.7.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.10/org.jacoco.core-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.11/org.jacoco.core-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.7/org.jacoco.report-0.8.7.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.10/org.jacoco.report-0.8.10.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.11/org.jacoco.report-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/dokka/dokka-core/1.4.32/dokka-core-1.4.32.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu-jvm/0.16.3/atomicfu-jvm-0.16.3.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.16.3/atomicfu-0.16.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.1/kotlinx-coroutines-core-jvm-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.0/kotlinx-coroutines-core-jvm-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1/kotlinx-coroutines-core-1.4.1.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.6.20/kotlin-android-extensions-runtime-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.10/kotlin-android-extensions-1.6.10.pom
@@ -1106,7 +1109,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.10/kotlin-reflect-1.9.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.9.20-RC/kotlin-reflect-1.9.20-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
@@ -1135,7 +1138,6 @@ 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.10/kotlin-stdlib-common-1.6.10.pom
 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.9.0/kotlin-stdlib-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.10/kotlin-stdlib-common-1.9.10.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
@@ -1148,7 +1150,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.10/kotlin-stdlib-jdk7-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
@@ -1160,7 +1162,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.10/kotlin-stdlib-jdk8-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
@@ -1182,8 +1184,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.31/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.pom
 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.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.10/kotlin-stdlib-1.9.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-RC/kotlin-stdlib-1.9.20-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,16 +1196,17 @@ https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-j
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 https://repo.maven.apache.org/maven2/org/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/json/json/20231013/json-20231013.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.9.3/junit-bom-5.9.3.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/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.5.0/mockito-core-5.5.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.6.0/mockito-core-5.6.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
@@ -1214,13 +1217,13 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.5/asm-bom-9.5.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.6/asm-bom-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.pom
@@ -1234,7 +1237,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
@@ -1246,7 +1249,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0/asm-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom

nix/deps/gradle/generate.sh

@@ -38,6 +38,17 @@ function gen_deps_list() {
     echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_LIST}")${RST} direct dependencies..."
 }
 
+# FIXME: Temporary fix for missing packages.
+# https://github.com/status-im/status-mobile/issues/15447
+function add_deps_hack() {
+    echo -n \
+'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+com.android.tools.lint:lint-gradle:30.2.2
+com.android.tools.build:gradle:7.0.4' \
+        >> "${DEPS_LIST}"
+}
+
 # Find download URLs for each dependency.
 function gen_deps_urls() {
     go-maven-resolver < "${DEPS_LIST}" | sort -uV -o "${DEPS_URLS}"
@@ -82,10 +93,7 @@ fi
 # Run each stage in order
 gen_proj_list
 gen_deps_list
-# FIXME: Temporary fix for missing package.
-echo 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10' >> "${DEPS_LIST}"
-echo 'com.android.tools.lint:lint-gradle:30.2.2' >> "${DEPS_LIST}"
-echo 'com.android.tools.build:gradle:7.0.4' >> "${DEPS_LIST}"
+add_deps_hack
 gen_deps_urls
 gen_deps_json
 

nix/deps/gradle/url2json.sh

@@ -16,7 +16,7 @@ declare -a REPOS=(
 
 # These files are not necessary for the build process.
 FILENAMES_BLACKLIST='-(javadoc|runtime|gwt|headers|sources|src|tests|adapters|modular|site|bin)\.'
-FILETYPES_BLACKLIST='(pom|json|zip|module|xml|md5|sha1|sha256|sha512)$'
+FILETYPES_BLACKLIST='(pom|json|zip|xml|md5|sha1|sha256|sha512)$'
 SIGNATURE_BLACKLIST='(pom|jar|json|zip|module|xml|md5|asc).asc$'
 
 function nix_prefetch() {

nix/overlay.nix

@@ -65,6 +65,7 @@ in {
   # Package version adjustments
   gradle = super.gradle_7;
   nodejs = super.nodejs-18_x;
+  ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
   xcodeWrapper = super.xcodeenv.composeXcodeWrapper {

nix/shell.nix

@@ -22,8 +22,6 @@ in mkShell {
       lsof # used in start-react-native.sh
       # build specific utilities
       clojure maven watchman
-      # lint specific utilities
-      clj-kondo zprint
       # other nice to have stuff
       yarn nodejs python310
     ] # and some special cases

nix/shells.nix

@@ -18,7 +18,11 @@ let
 
     # for calling clojure targets in CI or Makefile
     clojure = mkShell {
-      buildInputs = with pkgs; [ clojure flock maven openjdk ];
+      buildInputs = with pkgs; [
+        clojure flock maven openjdk
+        # lint specific utilities
+        babashka clj-kondo clojure-lsp ripgrep zprint
+      ];
       # CLASSPATH from clojure deps with 'src' appended to find local sources.
       shellHook = with pkgs; ''
         export CLASS_PATH="$(find ${deps.clojure} -iname '*.jar' | tr '\n' ':')src"

package.json

@@ -4,21 +4,15 @@
   "main": "modules/react-native-status/nodejs/bindings.js",
   "private": true,
   "scripts": {
-    "start": "react-native start",
-    "ios": "react-native run-ios",
-    "preinstall": "make status-go-library",
-    "app:compile:android": "shadow-cljs compile android",
-    "app:watch": "shadow-cljs watch android",
-    "app:packager": "react-native start --host 0.0.0.0 --port 8081",
-    "app:android": "react-native run-android",
-    "prettier": "node_modules/.bin/prettier --write ."
+    "_comment": "This also prevents 'yarn install' from running outside of nix.",
+    "preinstall": "scripts/check-nix-shell.sh && make status-go-library"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
     "@react-native-async-storage/async-storage": "^1.17.9",
+    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.3-status",
-    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
+    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
     "@react-native-community/clipboard": "^1.2.2",
     "@react-native-community/hooks": "^3.0.0",
     "@react-native-community/masked-view": "^0.1.6",
@@ -40,7 +34,7 @@
     "react-native": "0.69.10",
     "react-native-background-timer": "^2.1.1",
     "react-native-blob-util": "^0.13.18",
-    "react-native-camera-kit": "^13.0.0",
+    "react-native-camera-kit": "14.0.0-beta13",
     "react-native-config": "^1.5.0",
     "react-native-dialogs": "^1.0.4",
     "react-native-draggable-flatlist": "^4.0.1",
@@ -53,6 +47,7 @@
     "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.0",
     "react-native-image-resizer": "^1.2.3",
     "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
+    "react-native-intersection-observer": "^0.2.0",
     "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",

scripts/check-metro-shadow-process.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if pgrep -f 'shadow-cljs watch mobile' > /dev/null; then
+    echo "Error: make run-clojure is already running in another terminal" >&2
+    echo "Please close that terminal before running this command." >&2
+    exit 1
+fi
+
+if pgrep -f 'react-native start' > /dev/null; then
+    echo "Error: make run-metro is already running in another terminal" >&2
+    echo "Please close that terminal before running this command." >&2
+    exit 1
+fi
+
+exit 0

scripts/check-nix-shell.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Check if inside Nix shell
+if [[ -z "${IN_NIX_SHELL}" ]]; then
+    echo "ERROR: This command must be run inside a Nix shell. Please ensure you're inside a nix shell and try again."
+    exit 1
+fi

scripts/lint-direct-require-component-outside-quo.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# quo components namespace ends with style|utils|types|reaction-resource
+# are not the component view, they are usually utils fns or styles
+
+if rg --pcre2 --glob '!src/quo/**/*' 'quo\.components(\.[\w-]+)*\.[\w-]*(?<!style|utils|types|reaction-resource)(\s|\]|\n)' src; then
+  echo "Found above direct require of quo component outside src/quo/"
+  echo "For more info, check the style guide https://github.com/status-im/status-mobile/blob/develop/doc/new-guidelines.md#requiring-quo-components"
+  exit 1
+elif [ $? -eq 1 ]; then
+  exit 0
+else
+  exit $?
+fi

scripts/lint-old-quo-usage.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env sh
-
-set -euo pipefail
-
-QUO_USAGES=$(grep -r -E '\[quo\.[^ ]* :(?:as|refer)|\[quo\.[^ ]*\]' --include '*.cljs' --include '*.clj' './src/status_im2' --exclude='./src/status_im2/common/theme/core.cljs' || true)
-
-echo -e "\nChecking 'status_im2' namespace for 'quo' namespace usage."
-
-if [ -n "$QUO_USAGES" ]; then
-    echo -e "\033[0;31mERROR: Usage of the old 'quo' namespace detected in 'status_im2' code. Please update to 'quo2'. \n"
-    echo -e "$QUO_USAGES \033[0m"
-    exit 1
-fi

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

@@ -1,9 +1,9 @@
 #!/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\.)' --include '*.cljs' --include '*.clj' './src/quo')
 
 if test -n "$INVALID_CHANGES"; then
-    echo "WARNING: re-frame, status-im are not allowed in quo2 components"
+    echo "WARNING: re-frame, status-im are not allowed in quo components"
     echo ''
     echo "$INVALID_CHANGES"
     exit 1

scripts/lint_translations.clj

@@ -0,0 +1,98 @@
+#!/usr/bin/env bb
+
+(ns lint-translations
+  (:require [babashka.pods :as pods]))
+
+(pods/load-pod 'clj-kondo/clj-kondo "2023.09.07")
+(require '[pod.borkdude.clj-kondo :as kondo])
+(require '[cheshire.core :as json])
+(require '[clojure.set :as set])
+
+(def src-paths ["src"])
+
+(def translation-file "translations/en.json")
+
+;; set the following to true when solving https://github.com/status-im/status-mobile/issues/17811
+(def flag-show-non-namespaced-translation-keys false)
+(def flag-show-non-namespaced-translation-keys-occurrences false) ;; this makes the output super verbose!
+
+;; set the following to true when solving https://github.com/status-im/status-mobile/issues/17813
+;; and keep it permanently on after #17811 and #17813 have both been solved
+(def flag-show-unused-translation-keys false)
+
+(def flag-show-missing-translation-keys true)
+
+(defn- safe-name
+  [x]
+  (when x (name x)))
+
+(defn- ->keyword
+  [analysis-keyword]
+  (keyword (safe-name (:ns analysis-keyword)) (:name analysis-keyword)))
+
+(defn- report-issues
+  [incorrect-usages]
+  (doseq [incorrect-usage incorrect-usages]
+    (->> incorrect-usage
+         ((juxt :filename :row :reason ->keyword))
+         (apply format "%s:%s %s %s")
+         println)))
+
+(defn- extract-translation-keys
+  [file]
+  (-> file slurp json/parse-string keys))
+
+(def ^:private probably-unused-warning
+  (format "Probably unused translation key in %s:" translation-file))
+
+(defn -main
+  [& _args]
+  (println "Linting translations...")
+  (let [result                           (kondo/run!
+                                          {:lint   src-paths
+                                           :config {:output {:analysis {:keywords true}}}})
+        all-keywords                     (get-in result [:analysis :keywords])
+        used-translations                (filter (comp (partial = 't) :ns) all-keywords)
+        file-translation-keys            (apply sorted-set (extract-translation-keys translation-file))
+        missing-translations             (remove (comp file-translation-keys :name) used-translations)
+        used-translation-keys            (set (map :name used-translations))
+        possibly-unused-translation-keys (set/difference file-translation-keys used-translation-keys)
+        non-namespaced-translations      (filter
+                                          (fn [kw]
+                                            (and (not (:ns kw))
+                                                 (possibly-unused-translation-keys (:name kw))))
+                                          all-keywords)
+        unused-translation-keys          (set/difference possibly-unused-translation-keys
+                                                         (set (map :name non-namespaced-translations)))]
+
+    ;; TODO (2023-11-06 akatov): delete the following once #17811 and #17813 have both been solved
+    (doseq [k (apply sorted-set (map :name non-namespaced-translations))]
+      (when flag-show-non-namespaced-translation-keys
+        (println "Probably non-namespaced key" k))
+      (when flag-show-non-namespaced-translation-keys-occurrences
+        (->> non-namespaced-translations
+             (filter #(= k (:name %)))
+             (map #(assoc % :reason "Possibly non-namespaced translation key"))
+             report-issues)))
+
+    (when flag-show-unused-translation-keys
+      (run! #(println probably-unused-warning %) unused-translation-keys))
+
+    (when flag-show-missing-translation-keys
+      (report-issues (map #(assoc % :reason "Undefined Translation Key") missing-translations)))
+
+    (if (and
+         (or (not flag-show-missing-translation-keys)
+             (empty? missing-translations))
+         (or (not flag-show-unused-translation-keys)
+             (empty? possibly-unused-translation-keys))
+         (or (not flag-show-non-namespaced-translation-keys)
+             (not flag-show-non-namespaced-translation-keys-occurrences)
+             (empty? unused-translation-keys)))
+      0
+      1)))
+
+(when (= *file* (System/getProperty "babashka.file"))
+  (->> *command-line-args*
+       (apply -main)
+       System/exit))

scripts/start-react-native.sh

@@ -14,4 +14,4 @@ if [ ! -z "$METRO_PID" ]; then
   [[ $term == 'y' ]] && kill $METRO_PID
 fi
 
-yarn start
+react-native start

shadow-cljs.edn

@@ -5,27 +5,25 @@
                 [re-frame "1.3.0"]
                 [binaryage/oops "0.7.2"]
                 [com.andrewmcveigh/cljs-time "0.5.2"]
-                [status-im/timbre "4.10.0-2-status"]
-                [hickory "0.7.1"]
-                [cljs-bean "1.3.0"]
-                [com.cognitect/transit-cljs "0.8.248"]
-                [mvxcvi/alphabase "1.0.0"]
+                [com.taoensso/timbre "6.3.1"]
+                [cljs-bean "1.9.0"]
+                [com.cognitect/transit-cljs "0.8.280"]
                 [camel-snake-kebab "0.4.3"]
+
                 ;; 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"]
+
+                ;; Use the same version specified in the Nix dependency.
+                [clj-kondo/clj-kondo "2023.09.07"]
+
                 ;; Routing
                 [bidi "2.1.6"]
                 ;; Test dependencies
                 [day8.re-frame/test "0.1.5"]
-                [com.taoensso/tufte "2.1.0"]]
+                [com.taoensso/tufte "2.6.3"]]
 
  ;; port and middleware for repl in development
  :nrepl {:port       7888
@@ -107,12 +105,10 @@
    :optimizations :simple
    :target :node-test
    ;; Uncomment line below to `make test-watch` a specific file
-   ;; :ns-regexp "status-im2.subs.chat.messages-test$"
-   :main
-   status-im.test-runner/main
+   ;; :ns-regexp "status-im2.subs.messages-test$"
+   :main status-im.test-runner/main
    ;; set :ui-driven to true to let shadow-cljs inject node-repl
-   :ui-driven
-   true
+   :ui-driven true
    :closure-defines
    {status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im2.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
@@ -143,7 +139,7 @@
    :compiler-options {:optimizations :simple
                       :source-map    false}}
   :component-test {:target           :npm-module
-                   :entries          [quo2.core-spec status-im2.core-spec]
+                   :entries          [quo.core-spec status-im2.core-spec]
                    :ns-regexp        "component-spec$"
                    :output-dir       "component-spec"
                    :compiler-options {:warnings-as-errors false

src/js/worklets/lightbox.js

@@ -6,10 +6,3 @@ export function infoLayout(input, isTop) {
     return isTop ? input.value : -input.value;
   });
 }
-
-export function textSheet(input, isHeight) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isHeight ? input.value : -input.value;
-  });
-}

src/js/worklets/shell/constants.js

@@ -9,10 +9,12 @@ export const OPEN_WITH_ANIMATION = 3;
 // Floating Screen States
 export const CLOSE_SCREEN_WITHOUT_ANIMATION = 0;
 export const OPEN_SCREEN_WITHOUT_ANIMATION = 1;
-export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 2;
-export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 3;
-export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 4;
-export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 5;
+export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 2;
+export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 3;
+export const CLOSE_SCREEN_WITH_SLIDE_TO_RIGHT_ANIMATION = 4;
+export const OPEN_SCREEN_WITH_SLIDE_FROM_RIGHT_ANIMATION = 5;
+export const CLOSE_SCREEN_WITH_SLIDE_TO_BOTTOM_ANIMATION = 6;
+export const OPEN_SCREEN_WITH_SLIDE_FROM_BOTTOM_ANIMATION = 7;
 
 export const SHELL_ANIMATION_TIME = 200;
 

src/js/worklets/shell/floating_screen.js

@@ -6,10 +6,6 @@ export function screenLeft(screenState, screenWidth, switcherCardLeftPosition) {
   return useDerivedValue(function () {
     'worklet';
     switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
-        return withTiming(screenWidth, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SLIDE_ANIMATION:
-        return withTiming(0, constants.EASE_OUT_EASING);
       case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
         return screenWidth;
       case constants.OPEN_SCREEN_WITHOUT_ANIMATION:
@@ -17,25 +13,51 @@ export function screenLeft(screenState, screenWidth, switcherCardLeftPosition) {
         // https://github.com/software-mansion/react-native-reanimated/issues/3296#issuecomment-1573900172
         return withSequence(withTiming(-1, { duration: 0 }), withTiming(0, { duration: 0 }));
       case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardLeftPosition, constants.EASE_OUT_EASING);
+        return withSequence(
+          withTiming(switcherCardLeftPosition, constants.EASE_OUT_EASING),
+          withTiming(screenWidth, { duration: 0 }),
+        );
       case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
         return withTiming(0, constants.EASE_OUT_EASING);
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_RIGHT_ANIMATION:
+        return withTiming(screenWidth, constants.EASE_OUT_EASING);
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_RIGHT_ANIMATION:
+        return withTiming(0, constants.EASE_OUT_EASING);
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_BOTTOM_ANIMATION:
+        return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(screenWidth, { duration: 0 }));
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_BOTTOM_ANIMATION:
+        return 0;
       default:
         return screenWidth;
     }
   });
 }
 
-export function screenTop(screenState, switcherCardTopPosition) {
+export function screenTop(screenState, screenHeight, switcherCardTopPosition) {
   return useDerivedValue(function () {
     'worklet';
     switch (screenState.value) {
+      case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
+        return screenHeight;
+      case constants.OPEN_SCREEN_WITHOUT_ANIMATION:
+        return withSequence(withTiming(-1, { duration: 0 }), withTiming(0, { duration: 0 }));
       case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardTopPosition, constants.EASE_OUT_EASING);
+        return withSequence(
+          withTiming(switcherCardTopPosition, constants.EASE_OUT_EASING),
+          withTiming(screenHeight, { duration: 0 }),
+        );
       case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
         return withTiming(0, constants.EASE_OUT_EASING);
-      default:
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_RIGHT_ANIMATION:
+        return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(screenHeight, { duration: 0 }));
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_RIGHT_ANIMATION:
         return 0;
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_BOTTOM_ANIMATION:
+        return withTiming(screenHeight, constants.EASE_OUT_EASING);
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_BOTTOM_ANIMATION:
+        return withTiming(0, constants.EASE_OUT_EASING);
+      default:
+        return screenHeight;
     }
   });
 }
@@ -79,7 +101,8 @@ export function screenZIndex(screenState) {
     'worklet';
     switch (screenState.value) {
       case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-      case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_RIGHT_ANIMATION:
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_BOTTOM_ANIMATION:
         return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(-1, { duration: 0 }));
       case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
         return -1;
@@ -95,10 +118,12 @@ export function screenBorderRadius(screenState) {
     switch (screenState.value) {
       case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
         return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(0, { duration: 0 }));
-      case constants.OPEN_SCREEN_WITH_SLIDE_ANIMATION:
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_RIGHT_ANIMATION:
+      case constants.OPEN_SCREEN_WITH_SLIDE_FROM_BOTTOM_ANIMATION:
       case constants.OPEN_SCREEN_WITHOUT_ANIMATION:
         return 0;
-      case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_RIGHT_ANIMATION:
+      case constants.CLOSE_SCREEN_WITH_SLIDE_TO_BOTTOM_ANIMATION:
         return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(20, { duration: 0 }));
       case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
       case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:

src/mocks/js_dependencies.cljs

@@ -1,6 +1,7 @@
 (ns mocks.js-dependencies
   (:require-macros [status-im.utils.slurp :refer [slurp]])
-  (:require [status-im.fleet.default-fleet :refer (default-fleets)])
+  (:require
+    [status-im.fleet.default-fleet :refer (default-fleets)])
   (:require [status-im.utils.test :as utils.test]))
 
 ;; to generate a js Proxy at js/__STATUS_MOBILE_JS_IDENTITY_PROXY__ that accept any (.xxx) call and
@@ -299,6 +300,11 @@
    {:clamp     nil
     :withPause (fn [])})
 
+(def react-native-intersection-observer
+  #js
+   {:InView     #js {}
+    :IOFlatList #js {}})
+
 (def react-native-languages
   (clj->js {:default {:language            "en"
                       :addEventListener    (fn [])
@@ -323,7 +329,11 @@
 
 (def react-native-permissions #js {:default #js {}})
 
-(def push-notification-ios #js {:default #js {:abandonPermissions identity}})
+(def push-notification-ios
+  #js
+   {:default #js
+              {:abandonPermissions              identity
+               :removeAllDeliveredNotifications identity}})
 
 (def rn-emoji-keyboard
   #js {:EmojiKeyboard #js {}})
@@ -341,7 +351,8 @@
   (clj->js {:BlurView {}}))
 
 (def react-native-camera-roll
-  (clj->js {:default #js {}}))
+  (clj->js {:default    #js {}
+            :CameraRoll #js {}}))
 
 (def react-native-orientation-locker
   (clj->js {:default                    #js {}
@@ -405,7 +416,7 @@
     "react-native-navigation"                        react-native-navigation
     "@react-native-community/push-notification-ios"  push-notification-ios
     "@react-native-community/blur"                   react-native-blur
-    "@react-native-community/cameraroll"             react-native-camera-roll
+    "@react-native-camera-roll/camera-roll"          react-native-camera-roll
     "react-native-camera-kit"                        react-native-camera-kit
     "react-native-permissions"                       react-native-permissions
     "rn-emoji-keyboard"                              rn-emoji-keyboard
@@ -420,6 +431,7 @@
     "react-native-transparent-video"                 react-native-transparent-video
     "react-native-orientation-locker"                react-native-orientation-locker
     "react-native-gifted-charts"                     react-native-gifted-charts
+    "react-native-intersection-observer"             react-native-intersection-observer
     "../resources/data/emojis/en.json"               (js/JSON.parse (slurp
                                                                      "./resources/data/emojis/en.json"))
     "../src/js/worklets/core.js"                     worklet-factory

src/native_module/core.cljs

@@ -1,11 +1,10 @@
 (ns native-module.core
-  (:require ["react-native" :as react-native]
-            [utils.validators :as validators]
-            [taoensso.timbre :as log]
-            [react-native.platform :as platform]
-            [react-native.core :as rn]
-            [utils.transforms :as types]
-            [clojure.string :as string]))
+  (:require
+    ["react-native" :as react-native]
+    [clojure.string :as string]
+    [react-native.platform :as platform]
+    [taoensso.timbre :as log]
+    [utils.transforms :as types]))
 
 (defn status
   []
@@ -14,7 +13,7 @@
 
 (defn init
   [handler]
-  (.addListener ^js rn/device-event-emitter "gethEvent" #(handler (.-jsonEvent ^js %))))
+  (.addListener ^js (.-DeviceEventEmitter ^js react-native) "gethEvent" #(handler (.-jsonEvent ^js %))))
 
 (defn clear-web-data
   []
@@ -431,19 +430,6 @@
     ;; in unknown scenarios we also consider the device rooted to avoid degrading security
     :else (callback true)))
 
-(defn generate-gfycat
-  "Generate a 3 words random name based on the user public-key, synchronously"
-  [public-key]
-  (log/debug "[native-module] generate-gfycat")
-  (when (validators/valid-public-key? public-key)
-    (.generateAlias ^js (status) public-key)))
-
-(defn identicon
-  "Generate a icon based on a string, synchronously"
-  [seed]
-  (log/debug "[native-module] identicon")
-  (.identicon ^js (status) seed))
-
 (defn encode-transfer
   [to-norm amount-hex]
   (log/debug "[native-module] encode-transfer")
@@ -501,12 +487,6 @@
   (log/debug "[native-module] to-checksum-address")
   (.toChecksumAddress ^js (status) address))
 
-(defn gfycat-identicon-async
-  "Generate an icon based on a string and 3 words random name asynchronously"
-  [seed callback]
-  (log/debug "[native-module] gfycat-identicon-async")
-  (.generateAliasAndIdenticonAsync ^js (status) seed callback))
-
 (defn validate-mnemonic
   "Validate that a mnemonic conforms to BIP39 dictionary/checksum standards"
   [mnemonic callback]

src/native_module/push_notifications.cljs

@@ -0,0 +1,43 @@
+(ns native-module.push-notifications
+  (:require
+    ["react-native" :as react-native]
+    [taoensso.timbre :as log]))
+
+(defn push-notification
+  []
+  (when (exists? (.-NativeModules react-native))
+    (.-PushNotification ^js (.-NativeModules react-native))))
+
+(defn present-local-notification
+  [opts]
+  (.presentLocalNotification ^js (push-notification) (clj->js opts)))
+
+(defn clear-message-notifications
+  [chat-id]
+  (.clearMessageNotifications ^js (push-notification) chat-id))
+
+(defn clear-all-message-notifications
+  []
+  (.clearAllMessageNotifications ^js (push-notification)))
+
+(defn create-channel
+  [{:keys [channel-id channel-name]}]
+  (.createChannel ^js (push-notification)
+                  #js {:channelId channel-id :channelName channel-name}
+                  #(log/info "Notifications create channel:" %)))
+
+(defn enable-notifications
+  []
+  (.enableNotifications ^js (push-notification)))
+
+(defn disable-notifications
+  []
+  (.disableNotifications ^js (push-notification)))
+
+(defn add-listener
+  [event callback]
+  (.addListener ^js (.-DeviceEventEmitter ^js react-native)
+                event
+                (fn [^js data]
+                  (when (and data (.-dataJSON data) callback)
+                    (callback (.-dataJSON data))))))

src/quo/README.md

@@ -1,49 +1,215 @@
-# Status Quo Components
-All components in **Quo** should be independent of the app state. They should be _pure_
-and _easy to reason about_. Avoiding the app state is also required to make the library
-independent and easy to be pulled off as a separate repository when needed.
-To avoid high coupling and direct use of internal styling, the components should be
-exported via namespace `quo.core` and used by the Status app only from there. This will
-allow a more flexible way to update components without possible breakages into the
-app style.
+# Quo Library
 
-**Quo** components should not have any dependency on the Status app, this
-will avoid circular dependency and also benefit the independence of the components.
+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).
 
-All components are stored inside `components` namespaces. They are stateless and do
-not dispatch and subscribe to re-frame database. All state should be passed by props
-and all events can be passed as functions. Avoiding direct connection with re-frame
-will allow components to grow and be reused in different places without the
-conditionals hell.
+The overarching goals of having this component library are:
 
-All style system constants are stored inside `design-system` namespaces. They are used
-to build components and can be directly required by the status app. Avoid
-duplication of these vars and do not use them in code directly as a value.
+- Achieve the highest possible fidelity between code and the design system in
+  Figma.
+- Decouple components from ever-changing business requirements.
 
-For each component introduced, add previews of all possible states.
+> [!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).
 
-Do not introduce components for slightly modified existing components, if they are
-not a part of the design system. In case they are required in one place in the app,
-use style override.
+## Directory structure and file names
 
-# Code style
-Ensure that your changes match the style of the rest of the code.
-This library uses Clojure Community code style [The Clojure Style Guide](https://github.com/bbatsov/clojure-style-guide).
-To ensure consistency, run `make lint`, which uses the [clj-kondo linter](https://github.com/borkdude/clj-kondo).
+We follow one basic rule: mirror Figma *pages* and their *component names* in
+the directory structure.
 
-# Best practices
+For example, in the screenshot below we see the Figma page is `Banners`
+and the component name is `Banner`.
 
-- Design components atomically and compose them into bigger components.
-- Do not export individual atoms, only components. This way we can limit design
-system to be used in too many way which can creating disjointed experiences.
-- Avoid external margins for atom components, it can be added on the wrapper
-where they are used but can't be removed without overriding.
-[Max Stoiber article on margins](https://mxstbr.com/thoughts/margin)
-- Design reusable components into [Layout Isolated Components](https://visly.app/blogposts/layout-isolated-components)
-(Article more relates to web, but ideas fits also to mobile development)
-- Explicit is better than implicit, do not rely on platform default, if you expect
-a specific value, then override it
+<img src="/doc/images/quo-component.png" width="600" />
 
-**TBD:**
-- Components documentation
-- Check props using spec in pre conditions.
+Therefore, the structure should look like:
+
+```
+quo/
+└── 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 quo.components.buttons.button.view
+(def view
+  [{:keys [type state size icon theme background]}]
+  ...)
+```
+
+### Handling Sizes
+In the designs, sizes are referred to as integers. To avoid having the codebase littered with magic numbers we instead have a keyword convention to use in components to map these keywords with their sizes.
+
+The convention is `:size-<number>`, e.g size `20` is `:size-20`
+
+```clojure
+;; bad
+(defn button
+  [{:keys [size]}]
+  [rn/view
+   {:style {:height (case size
+                      20 20
+                      40 40
+                      0)}}]
+  ...)
+```
+
+```clojure
+;; good
+(defn button
+  [{:keys [size]}]
+  [rn/view
+   {:style {:height (case size
+                      :size-20 20
+                      :size-40 40
+                      0)}}]
+  ...)
+```
+
+## 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 [quo.components.avatars.user-avatar.component-spec](/src/quo/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 `quo.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 quo.components.<figma page>.<component name>.view
+  (:require [quo.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 `quo.foundations.colors/theme-colors` or `quo.foundations.shadows/get`.
+
+## Avoid using quo's version number in namespace aliases
+
+When requiring quo 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/quo/` directories in the repository, but eventually the old one will go
+> away and the version number will lose its meaning.
+
+```clojure
+;; bad
+(ns ...
+  (require [quo.theme :as quo.theme]
+           [quo.core :as quo]))
+
+;; good
+(ns ...
+  (require [quo.theme :as quo.theme]
+           [quo.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/quo/animated.cljs

@@ -1,272 +0,0 @@
-(ns quo.animated
-  (:refer-clojure :exclude [abs set delay divide])
-  (:require ["react-native-reanimated" :default animated :refer (clockRunning EasingNode)]
-            ["react-native-redash/lib/module/v1" :as redash]
-            [oops.core :refer [ocall oget]]
-            [quo.gesture-handler :as gh]
-            quo.react
-            [quo.react-native :as rn]
-            [reagent.core :as reagent])
-  (:require-macros [quo.react :refer [maybe-js-deps]]))
-
-(def create-animated-component (comp reagent/adapt-react-class (.-createAnimatedComponent animated)))
-
-(def view (reagent/adapt-react-class (.-View animated)))
-(def text (reagent/adapt-react-class (.-Text animated)))
-(def scroll-view (reagent/adapt-react-class (.-ScrollView animated)))
-(def code (reagent/adapt-react-class (.-Code animated)))
-(def animated-flat-list (create-animated-component gh/flat-list-raw))
-
-(defn flat-list
-  [props]
-  [animated-flat-list (rn/base-list-props props)])
-
-(def useCode (.-useCode animated))
-
-(defn code!
-  ([setup-fn]
-   (useCode
-    (fn [] (setup-fn))))
-  ([setup-fn deps]
-   (useCode
-    (fn [] (setup-fn))
-    (maybe-js-deps deps))))
-
-(def eq (oget animated "eq"))
-(def neq (oget animated "neq"))
-(def greater (oget animated "greaterThan"))
-(def greater-or-eq (oget animated "greaterOrEq"))
-(def less (oget animated "lessThan"))
-(def less-or-eq (oget animated "lessOrEq"))
-(def not* (oget animated "not"))
-(def or* (oget animated "or"))
-(def and* (oget animated "and"))
-
-(def diff (oget animated "diff"))
-(def add (oget animated "add"))
-(def sub (oget animated "sub"))
-(def multiply (oget animated "multiply"))
-(def divide (oget animated "divide"))
-(def abs (oget animated "abs"))
-
-(def min* (oget animated "min"))
-(def max* (oget animated "max"))
-
-(def set (oget animated "set"))
-(def start-clock (oget animated "startClock"))
-(def stop-clock (oget animated "stopClock"))
-(def clock-running clockRunning)
-(def bezier (.-bezier ^js EasingNode))
-(def linear (.-linear ^js EasingNode))
-
-(def easings
-  {:linear      linear
-   :ease-in     (bezier 0.42 0 1 1)
-   :ease-out    (bezier 0 0 0.58 1)
-   :ease-in-out (bezier 0.42 0 0.58 1)
-   :cubic       (bezier 0.55 0.055 0.675 0.19)
-   :keyboard    (bezier 0.17 0.59 0.4 0.77)})
-
-(def springs
-  {:lazy {:damping           50
-          :mass              0.3
-          :stiffness         120
-          :overshootClamping true
-          :bouncyFactor      1}
-   :jump {:damping                   13
-          :mass                      0.5
-          :stiffness                 170
-          :overshootClamping         false
-          :bouncyFactor              1
-          :restSpeedThreshold        0.001
-          :restDisplacementThreshold 0.001}})
-
-(defn set-value
-  [anim v]
-  (ocall anim "setValue" v))
-
-(def Value (oget animated "Value"))
-
-(defn value
-  [x]
-  (new Value x))
-
-(def Clock (oget animated "Clock"))
-
-(defn clock
-  []
-  (new Clock))
-
-(def debug (oget animated "debug"))
-(def log (oget animated "log"))
-
-(defn event
-  ([config]
-   (event config {}))
-  ([config options]
-   (ocall animated "event" (clj->js config) (clj->js options))))
-
-(defn on-change
-  [state node]
-  (ocall animated
-         "onChange"
-         state
-         (if (vector? node)
-           (clj->js node)
-           node)))
-
-(defn cond*
-  ([condition node]
-   (.cond ^js animated
-          condition
-          (if (vector? node)
-            (clj->js node)
-            node)))
-  ([condition if-node else-node]
-   (.cond ^js animated
-          condition
-          (if (vector? if-node)
-            (clj->js if-node)
-            if-node)
-          (if (vector? else-node)
-            (clj->js else-node)
-            else-node))))
-
-(defn block
-  [opts]
-  (.block ^js animated (to-array opts)))
-
-(defn interpolate
-  [anim-value config]
-  (.interpolateNode ^js animated anim-value (clj->js config)))
-
-(defn call*
-  [args callback]
-  (.call ^js animated (to-array args) callback))
-
-(defn timing
-  [clock-value opts config]
-  (.timing ^js animated
-           clock-value
-           (clj->js opts)
-           (clj->js config)))
-
-(defn spring
-  [clock-value opts config]
-  (.spring ^js animated
-           clock-value
-           (clj->js opts)
-           (clj->js config)))
-
-(def extrapolate {:clamp (oget animated "Extrapolate" "CLAMP")})
-
-;; utilities
-
-(def clamp (oget redash "clamp"))
-(def diff-clamp (.-diffClamp ^js redash))
-
-(defn with-spring
-  [config]
-  (ocall redash "withSpring" (clj->js config)))
-
-(defn with-decay
-  [config]
-  (.withDecay ^js redash (clj->js config)))
-
-(defn with-offset
-  [config]
-  (.withOffset ^js redash (clj->js config)))
-
-(defn with-spring-transition
-  [v config]
-  (.withSpringTransition ^js redash v (clj->js config)))
-
-(defn with-timing-transition
-  [v config]
-  (.withTimingTransition ^js redash v (clj->js config)))
-
-(defn use-spring-transition
-  [v config]
-  (.useSpringTransition ^js redash v (clj->js config)))
-
-(defn use-timing-transition
-  [v config]
-  (.useTimingTransition ^js redash v (clj->js config)))
-
-(defn re-timing
-  [config]
-  (.timing ^js redash (clj->js config)))
-
-(defn re-spring
-  [config]
-  (.spring ^js redash (clj->js config)))
-
-(defn on-scroll
-  [opts]
-  (ocall redash "onScrollEvent" (clj->js opts)))
-
-(defn on-gesture
-  [opts]
-  (let [gesture-event (event #js [#js {:nativeEvent (clj->js opts)}])]
-    {:onHandlerStateChange gesture-event
-     :onGestureEvent       gesture-event}))
-
-(def mix (.-mix ^js redash))
-
-(def mix-color (.-mixColor ^js redash))
-
-(def delay (.-delay ^js redash))
-
-(defn loop*
-  [opts]
-  (ocall redash "loop" (clj->js opts)))
-
-(def use-value (.-useValue ^js redash))
-
-(def use-clock (.-useClock ^js redash))
-
-(defn use-gesture
-  [opts]
-  (let [gesture (.useGestureHandler ^js redash (clj->js opts))]
-    {:onHandlerStateChange (.-onHandlerStateChange ^js gesture)
-     :onGestureEvent       (.-onGestureEvent ^js gesture)}))
-
-(defn snap-point
-  [v velocity snap-points]
-  (.snapPoint ^js redash v velocity (to-array snap-points)))
-
-(defn with-easing
-  [{v     :value
-    :keys [snap-points velocity offset state easing duration
-           animation-over]
-    :or   {duration       250
-           animation-over (value 1)
-           easing         (:ease-out easings)}}]
-  (let [position         (value 0)
-        c                (clock)
-        interrupted      (and* (eq state (:began gh/states))
-                               (clock-running c))
-        vel              (multiply velocity 1.5)
-        to               (snap-point position vel snap-points)
-        finish-animation [(set offset position)
-                          (stop-clock c)
-                          (set animation-over 1)]]
-    (block
-     [(cond* interrupted finish-animation)
-      (cond* animation-over
-             (set position offset))
-      (cond* (neq state (:end gh/states))
-             [(set animation-over 0)
-              (set position (add offset v))])
-      (cond* (and* (eq state (:end gh/states))
-                   (not* animation-over))
-             [(set position
-                   (re-timing
-                    {:clock    c
-                     :easing   easing
-                     :duration duration
-                     :from     position
-                     :to       to}))
-              (cond* (not* (clock-running c))
-                     finish-animation)])
-      position])))

src/quo/components/animated/pressable.cljs

@@ -1,136 +0,0 @@
-(ns quo.components.animated.pressable
-  (:require [cljs-bean.core :as bean]
-            [quo.animated :as animated]
-            [quo.gesture-handler :as gesture-handler]
-            [quo.react :as react]
-            [reagent.core :as reagent]))
-
-(def long-press-duration 500)
-(def scale-down-small 0.95)
-(def scale-down-large 0.9)
-(def opactiy 0.75)
-(def time-in 100)
-(def time-out 200)
-
-(defmulti type->animation :type)
-
-(defmethod type->animation :primary
-  [{:keys [animation]}]
-  {:background {:transform [{:scale (animated/mix animation 1 scale-down-small)}]
-                :opacity   (animated/mix animation 1 opactiy)}
-   :foreground {:transform [{:scale (animated/mix animation 1 scale-down-small)}]
-                :opacity   (animated/mix animation 1 opactiy)}})
-
-(defmethod type->animation :secondary
-  [{:keys [animation]}]
-  {:background {:transform [{:scale (animated/mix animation scale-down-small 1)}]
-                :opacity   (animated/mix animation 0 opactiy)}
-   :foreground {:transform [{:scale (animated/mix animation 1 scale-down-small)}]
-                :opacity   (animated/mix animation 1 opactiy)}})
-
-(defmethod type->animation :icon
-  [{:keys [animation]}]
-  {:background {:transform [{:scale (animated/mix animation scale-down-large 1)}]
-                :opacity   (animated/mix animation 0 opactiy)}
-   :foreground {:transform [{:scale (animated/mix animation 1 scale-down-large)}]
-                :opacity   (animated/mix animation 1 opactiy)}})
-
-(defmethod type->animation :list-item
-  [{:keys [animation]}]
-  {:background {:opacity (animated/mix animation 0 opactiy)}
-   :foreground {:transform [{:scale (animated/mix animation 1 scale-down-small)}]
-                :opacity   (animated/mix animation 1 opactiy)}})
-
-(defmethod type->animation :scale
-  [{:keys [animation]}]
-  {:background {:opacity 0}
-   :foreground {:transform [{:scale (animated/mix animation 1 scale-down-small)}]
-                :opacity   (animated/mix animation 1 opactiy)}})
-
-(def absolute-fill
-  {:top      0
-   :bottom   0
-   :left     0
-   :right    0
-   :position :absolute})
-
-(defn pressable-hooks
-  [props]
-  (let [{background-color    :bgColor
-         border-radius       :borderRadius
-         border-color        :borderColor
-         border-width        :borderWidth
-         type                :type
-         disabled            :disabled
-         on-press            :onPress
-         on-long-press       :onLongPress
-         on-press-start      :onPressStart
-         accessibility-label :accessibilityLabel
-         children            :children
-         :or                 {border-radius 0
-                              type          "primary"}}
-        (bean/bean props)
-        long-press-ref (react/create-ref)
-        state (animated/use-value (:undetermined gesture-handler/states))
-        active (animated/eq state (:began gesture-handler/states))
-        gesture-handler (animated/use-gesture {:state state})
-        animation (react/use-memo
-                   (fn []
-                     (animated/with-timing-transition active
-                                                      {:duration (animated/cond* active time-in time-out)
-                                                       :easing   (:ease-in animated/easings)}))
-                   [])
-        {:keys [background
-                foreground]}
-        (react/use-memo
-         (fn []
-           (type->animation {:type      (keyword type)
-                             :animation animation}))
-         [type])
-        handle-press (fn [] (when on-press (on-press)))
-        long-gesture-handler (react/callback
-                              (fn [^js evt]
-                                (let [gesture-state (-> evt .-nativeEvent .-state)]
-                                  (when (and on-press-start
-                                             (= gesture-state (:began gesture-handler/states)))
-                                    (on-press-start))
-                                  (when (and on-long-press
-                                             (= gesture-state (:active gesture-handler/states)))
-                                    (on-long-press)
-                                    (animated/set-value state (:undetermined gesture-handler/states)))))
-                              [on-long-press on-press-start])]
-    (animated/code!
-     (fn []
-       (when on-press
-         (animated/cond* (animated/eq state (:end gesture-handler/states))
-                         [(animated/set state (:undetermined gesture-handler/states))
-                          (animated/call* [] handle-press)])))
-     [on-press])
-    (reagent/as-element
-     [gesture-handler/long-press-gesture-handler
-      {:enabled                 (boolean (and on-long-press (not disabled)))
-       :on-handler-state-change long-gesture-handler
-       :min-duration-ms         long-press-duration
-       :max-dist                22
-       :ref                     long-press-ref}
-      [animated/view
-       {:accessible          true
-        :accessibility-label accessibility-label}
-       [gesture-handler/tap-gesture-handler
-        (merge gesture-handler
-               {:shouldCancelWhenOutside true
-                :wait-for                long-press-ref
-                :enabled                 (boolean (and (or on-press on-long-press on-press-start)
-                                                       (not disabled)))})
-        [animated/view
-         [animated/view
-          {:style (merge absolute-fill
-                         background
-                         {:background-color background-color
-                          :border-radius    border-radius
-                          :border-color     border-color
-                          :border-width     border-width})}]
-         (into [animated/view {:style foreground}]
-               (react/get-children children))]]]])))
-
-(def pressable (reagent/adapt-react-class (react/memo pressable-hooks)))

src/quo/components/animated_header.cljs

@@ -1,103 +0,0 @@
-(ns quo.components.animated-header
-  (:require [oops.core :refer [oget]]
-            [quo.animated :as animated]
-            [quo.components.header :as header]
-            [quo.design-system.colors :as colors]
-            [quo.platform :as platform]
-            [reagent.core :as reagent]
-            [react-native.safe-area :as safe-area]))
-
-(defn header-wrapper-style
-  [{:keys [value offset]}]
-  (merge
-   {:background-color (:ui-background @colors/theme)}
-   (when (and offset platform/android?)
-     {:elevation (animated/interpolate
-                  value
-                  {:inputRange  [0 offset]
-                   :outputRange [0 4]
-                   :extrapolate (:clamp animated/extrapolate)})})
-   (when (and offset platform/ios?)
-     {:z-index        2
-      :shadow-opacity (animated/interpolate
-                       value
-                       {:inputRange  [0 offset]
-                        :outputRange [0 1]
-                        :extrapolate (:clamp animated/extrapolate)})
-      :shadow-radius  16
-      :shadow-color   (:shadow-01 @colors/theme)
-      :shadow-offset  {:width 0 :height 4}})))
-
-(defn title-style
-  [layout]
-  {:flex            1
-   :justify-content :center
-   :padding-right   (get-in layout [:right :width])})
-
-(defn header-container
-  []
-  (let [y               (animated/value 0)
-        animation-value (animated/value 0)
-        animation       (animated/with-timing-transition
-                         animation-value
-                         {:duration 250
-                          :easing   (:ease-in animated/easings)})
-        on-scroll       (animated/on-scroll {:y y})
-        layout          (reagent/atom {})
-        offset          (reagent/atom 0)
-        on-layout       (fn [evt]
-                          (reset! offset (oget evt "nativeEvent" "layout" "height")))]
-    (fn [{:keys [extended-header refresh-control refreshing-sub refreshing-counter] :as props} children]
-      [animated/view
-       {:flex           1
-        :pointer-events :box-none}
-       [animated/code
-        {:key  (str @offset)
-         :exec (animated/cond*
-                (animated/and* (animated/greater-or-eq y @offset)
-                               (animated/greater-or-eq y 1))
-                (animated/set animation-value 1)
-                (animated/set animation-value 0))}]
-       [animated/view
-        {:pointer-events :box-none
-         :style          (header-wrapper-style {:value  y
-                                                :offset @offset})}
-        [header/header
-         (merge
-          {:get-layout      (fn [el l] (swap! layout assoc el l))
-           :border-bottom   false
-           :title-component [animated/view {:style (title-style @layout)}
-                             [extended-header
-                              {:value     y
-                               :animation animation
-                               :minimized true
-                               :offset    @offset}]]
-           :title-align     :left}
-          (dissoc props :extended-header))]]
-       (into [animated/scroll-view
-              {:on-scroll           on-scroll
-               :refreshControl      (when refresh-control
-                                      (refresh-control
-                                       (and @refreshing-sub
-                                            @refreshing-counter)))
-               :style               {:z-index 1}
-               :scrollEventThrottle 16}
-              [animated/view {:pointer-events :box-none}
-               [animated/view
-                {:pointer-events :box-none
-                 :on-layout      on-layout}
-                [extended-header
-                 {:value     y
-                  :animation animation
-                  :offset    @offset}]]]]
-             children)])))
-
-(defn header
-  [{:keys [use-insets] :as props} & children]
-  (if use-insets
-    [header-container
-     (-> props
-         (dissoc :use-insets)
-         (assoc :insets (safe-area/get-insets)))
-     children]
-    [header-container props children]))

src/quo/components/animated_header_flatlist/style.cljs

@@ -1,6 +1,7 @@
-(ns quo2.components.animated-header-flatlist.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.reanimated :as reanimated]))
+(ns quo.components.animated-header-flatlist.style
+  (:require
+    [quo.foundations.colors :as colors]
+    [react-native.reanimated :as reanimated]))
 
 (defn container-view
   [view-height]

src/quo/components/animated_header_flatlist/view.cljs

@@ -1,16 +1,16 @@
-(ns quo2.components.animated-header-flatlist.view
+(ns quo.components.animated-header-flatlist.view
   (:require
-    [quo2.core :as quo]
+    [oops.core :as oops]
+    [quo.components.animated-header-flatlist.style :as style]
+    [quo.components.icon :as icon]
+    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
     [react-native.core :as rn]
+    [react-native.fast-image :as fast-image]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]
-    [react-native.fast-image :as fast-image]
-    [reagent.core :as reagent]
-    [quo2.foundations.colors :as colors]
-    [quo2.components.animated-header-flatlist.style :as style]
-    [oops.core :as oops]
-    [quo2.theme :as quo.theme]))
+    [reagent.core :as reagent]))
 
 (def header-height 234)
 (def cover-height 192)
@@ -73,11 +73,11 @@
       {:active-opacity 1
        :on-press       back-button-on-press
        :style          (style/button-container {:left 20 :theme theme})}
-      [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [icon/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
      [rn/touchable-opacity
       {:active-opacity 1
        :style          (style/button-container {:right 20 :theme theme})}
-      [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [icon/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
      [reanimated/blur-view
       {:blurAmount   32
        :blurType     :light

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

@@ -1,8 +1,9 @@
-(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]))
+(ns quo.components.avatars.account-avatar.component-spec
+  (:require
+    [quo.components.avatars.account-avatar.style :as style]
+    [quo.components.avatars.account-avatar.view :as account-avatar]
+    [quo.foundations.colors :as colors]
+    [test-helpers.component :as h]))
 
 (h/describe "Account Avatar"
   (h/test "default render"
@@ -28,7 +29,7 @@
                    {:height          (:size opts)
                     :width           (:size opts)
                     :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 60)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
       (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))})
@@ -47,7 +48,7 @@
         :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)})
+        :backgroundColor (colors/resolve-color (:customization-color opts) :light 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))})
@@ -64,7 +65,7 @@
                    {:height          (:size opts)
                     :width           (:size opts)
                     :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/custom-color-by-theme (:customization-color opts) 50 60)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
       (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))})
@@ -83,7 +84,7 @@
         :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)})
+        :backgroundColor (colors/resolve-color (:customization-color opts) :light 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))})

src/quo/components/avatars/account_avatar/style.cljs

@@ -1,5 +1,6 @@
-(ns quo2.components.avatars.account-avatar.style
-  (:require [quo2.foundations.colors :as colors]))
+(ns quo.components.avatars.account-avatar.style
+  (:require
+    [quo.foundations.colors :as colors]))
 
 (def default-size 80)
 (def default-border-radius 16)
@@ -63,14 +64,14 @@
                       (keyword? size) (container-size size))]
     (cond-> {:width            width
              :height           width
-             :background-color (colors/custom-color-by-theme customization-color 50 60 nil nil theme)
+             :background-color (colors/resolve-color customization-color theme)
              :border-radius    (get-border-radius size)
-             :border-color     (if (= theme :light) colors/neutral-80-opa-5 colors/white-opa-5)
+             :border-color     (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5 theme)
              :padding          (get-padding size)
              :align-items      :center
              :justify-content  :center}
 
       watch-only?
       (assoc :border-width     (get-border-width size)
-             :background-color (colors/custom-color-by-theme customization-color 50 50 10 10 theme)))))
+             :background-color (colors/resolve-color customization-color theme 10)))))
 

src/quo/components/avatars/account_avatar/view.cljs

@@ -1,8 +1,9 @@
-(ns quo2.components.avatars.account-avatar.view
-  (:require [clojure.string :as string]
-            [quo2.components.avatars.account-avatar.style :as style]
-            [quo2.theme :as quo.theme]
-            [react-native.core :as rn]))
+(ns quo.components.avatars.account-avatar.view
+  (:require
+    [clojure.string :as string]
+    [quo.components.avatars.account-avatar.style :as style]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]))
 
 (defn- view-internal
   "Opts:

src/quo/components/avatars/channel_avatar/component_spec.cljs

@@ -1,6 +1,7 @@
-(ns quo2.components.avatars.channel-avatar.component-spec
-  (:require [quo2.components.avatars.channel-avatar.view :as component]
-            [test-helpers.component :as h]))
+(ns quo.components.avatars.channel-avatar.component-spec
+  (:require
+    [quo.components.avatars.channel-avatar.view :as component]
+    [test-helpers.component :as h]))
 
 (h/describe "Channel Avatar"
   (h/test "default render"

src/quo/components/avatars/channel_avatar/style.cljs

@@ -1,10 +1,11 @@
-(ns quo2.components.avatars.channel-avatar.style
-  (:require [quo2.foundations.colors :as colors]))
+(ns quo.components.avatars.channel-avatar.style
+  (:require
+    [quo.foundations.colors :as colors]))
 
 (def lock-icon-size 12)
 
 (defn outer-container
-  [{:keys [size color]}]
+  [{:keys [size customization-color theme]}]
   (let [container-size (case size
                          :size-64 64
                          :size-32 32
@@ -14,7 +15,7 @@
      :border-radius    container-size
      :justify-content  :center
      :align-items      :center
-     :background-color (colors/theme-alpha color 0.1 0.1)}))
+     :background-color (colors/resolve-color customization-color theme 10)}))
 
 (defn emoji-size
   [size]
@@ -24,12 +25,12 @@
                 11)})
 
 (defn lock-container
-  [size]
+  [size theme]
   (let [distance (if (= size :size-32) 20 12)]
     {:position         :absolute
      :left             distance
      :top              distance
-     :background-color (colors/theme-colors colors/white colors/neutral-95)
+     :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
      :border-radius    (* 2 lock-icon-size)
      :padding          2}))
 

src/quo/components/avatars/channel_avatar/view.cljs

@@ -1,19 +1,21 @@
-(ns quo2.components.avatars.channel-avatar.view
-  (:require [clojure.string :as string]
-            [quo2.components.avatars.channel-avatar.style :as style]
-            [quo2.components.icon :as icons]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [utils.string]))
+(ns quo.components.avatars.channel-avatar.view
+  (:require
+    [clojure.string :as string]
+    [quo.components.avatars.channel-avatar.style :as style]
+    [quo.components.icon :as icons]
+    [quo.components.markdown.text :as text]
+    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
+    [utils.string]))
 
 (defn- initials
-  [full-name size color]
+  [{:keys [full-name size customization-color theme]}]
   (let [amount-initials (if (#{:size-32 :size-64} size) 2 1)
         channel-name    (string/replace full-name "#" "")]
     [text/text
      (cond-> {:accessibility-label :initials
-              :style               {:color color}
+              :style               {:color (colors/resolve-color customization-color theme)}
               :size                :paragraph-2
               :weight              :semi-bold}
        (= size :size-64) (assoc :size   :heading-1
@@ -21,18 +23,18 @@
      (utils.string/get-initials channel-name amount-initials)]))
 
 (defn- lock
-  [locked? size]
+  [locked? size theme]
   ;; When `locked?` is nil, we must not display the unlocked icon.
   (when (boolean? locked?)
     [rn/view
      {:accessibility-label :lock
-      :style               (style/lock-container size)}
+      :style               (style/lock-container size theme)}
      [icons/icon (if locked? :i/locked :i/unlocked)
-      {:color           (colors/theme-colors colors/neutral-50 colors/neutral-40)
+      {:color           (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
        :container-style style/lock-icon
        :size            12}]]))
 
-(defn view
+(defn- view-internal
   "Options:
 
   :size - keyword (default nil) - Container size, for the moment,
@@ -50,14 +52,22 @@
   :full-name - string (default nil) - When :emoji is blank, this value will be
   used to extract the initials.
   "
-  [{:keys [size emoji customization-color locked? full-name]}]
+  [{:keys [size emoji customization-color locked? full-name theme]}]
   [rn/view
    {:accessibility-label :channel-avatar
-    :style               (style/outer-container {:size size :color customization-color})}
+    :style               (style/outer-container {:theme               theme
+                                                 :size                size
+                                                 :customization-color customization-color})}
    (if (string/blank? emoji)
-     [initials full-name size customization-color]
+     [initials
+      {:full-name           full-name
+       :size                size
+       :customization-color customization-color
+       :theme               theme}]
      [rn/text
       {:style               (style/emoji-size size)
        :accessibility-label :emoji}
       (string/trim emoji)])
-   [lock locked? size]])
+   [lock locked? size theme]])
+
+(def view (quo.theme/with-theme view-internal))

src/quo/components/avatars/collection_avatar/component_spec.cljs

@@ -1,7 +1,8 @@
-(ns quo2.components.avatars.collection-avatar.component-spec
-  (:require [quo2.components.avatars.collection-avatar.view :as collection-avatar]
-            [quo2.foundations.resources :as resources]
-            [test-helpers.component :as h]))
+(ns quo.components.avatars.collection-avatar.component-spec
+  (:require
+    [quo.components.avatars.collection-avatar.view :as collection-avatar]
+    [quo.foundations.resources :as resources]
+    [test-helpers.component :as h]))
 
 (h/describe "collection avatar"
   (h/describe "Profile picture"

src/quo/components/avatars/collection_avatar/style.cljs

@@ -1,5 +1,6 @@
-(ns quo2.components.avatars.collection-avatar.style
-  (:require [quo2.foundations.colors :as colors]))
+(ns quo.components.avatars.collection-avatar.style
+  (:require
+    [quo.foundations.colors :as colors]))
 
 (defn collection-avatar
   [theme]