fix ens contenthash resolution

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2020-04-02 14:27:36 +02:00 · 2020-04-02 14:27:33 +02:00 · 2020-04-02 14:26:24 +02:00 · 2020-04-01 13:21:18 -04:00 · 2020-03-30 15:52:46 +02:00 · 2020-03-30 11:06:01 +02:00
6898 changed files with 139180 additions and 263746 deletions
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "module:metro-react-native-babel-preset"
+  ]
+}
@@ -1,185 +0,0 @@
-legacy.status-im.utils.build/warning-handler
-legacy.status-im.utils.build/get-current-sha
-status-im.constants/spacing-char
-status-im.constants/arg-wrapping-char
-legacy.status-im.ios.core/init
-legacy.status-im.ui.components.camera/aspects
-legacy.status-im.ui.components.camera/capture-targets
-legacy.status-im.ui.components.camera/set-torch
-legacy.status-im.ui.components.camera/request-access-ios
-legacy.status-im.chat.models.message-content/stylings
-legacy.status-im.chat.models.message-content/actions
-legacy.status-im.chat.models.message-content/blank-string
-legacy.status-im.chat.models.message-content/sorted-ranges
-legacy.status-im.ethereum.mnemonic/words->passphrase
-native-module.core/listener
-native-module.core/multiaccount-reset
-native-module.core/extract-group-membership-signatures
-native-module.core/sign-group-membership
-native-module.core/update-mailservers
-legacy.status-im.ethereum.abi-spec/bytes-to-hex
-legacy.status-im.android.core/init
-legacy.status-im.chat.models.message/transport-keys
-legacy.status-im.utils.datetime/week
-legacy.status-im.utils.datetime/time-ago
-legacy.status-im.utils.datetime/format-date
-legacy.status-im.utils.datetime/get-ordinal-date
-reagent.dom/render
-reagent.dom/unmount-component-at-node
-reagent.dom/dom-node
-reagent.dom/force-update-all
-legacy.status-im.multiaccounts.create.core/get-new-key-code
-legacy.status-im.ethereum.decode/string
-legacy.status-im.ui.screens.network.views/mainnet?
-legacy.status-im.data-store.chats/event->string
-legacy.status-im.mailserver.constants/seven-days
-legacy.status-im.mailserver.constants/connection-timeout
-legacy.status-im.hardwallet.card/install-applet
-legacy.status-im.hardwallet.card/install-cash-applet
-legacy.status-im.multiaccount.login.data-test/all-contacts
-legacy.status-im.multiaccount.login.data-test/multiaccounts
-legacy.status-im.multiaccount.login.data-test/get-chats
-legacy.status-im.multiaccount.login.data-test/transport
-legacy.status-im.multiaccount.login.data-test/topics
-legacy.status-im.utils.utils/clear-timeout
-legacy.status-im.utils.handlers/logged-in
-legacy.status-im.multiaccounts.model/credentials
-legacy.status-im.multiaccounts.login.core/contract-fleet?
-legacy.status-im.multiaccounts.login.core/fetch-nodes
-status-im.config/rpc-networks-only?
-status-im.config/waku-enabled?
-legacy.status-im.utils.pairing/has-paired-installations?
-legacy.status-im.tribute-to-talk.core-test/user-cofx
-mocks.js-dependencies/action-button
-mocks.js-dependencies/camera
-mocks.js-dependencies/dismiss-keyboard
-mocks.js-dependencies/emoji-picker
-mocks.js-dependencies/i18n
-mocks.js-dependencies/qr-code
-mocks.js-dependencies/svg
-mocks.js-dependencies/icons
-mocks.js-dependencies/webview
-mocks.js-dependencies/desktop-linking
-mocks.js-dependencies/desktop-shortcuts
-mocks.js-dependencies/snoopy
-mocks.js-dependencies/snoopy-filter
-mocks.js-dependencies/snoopy-bars
-mocks.js-dependencies/snoopy-buffer
-mocks.js-dependencies/desktop-menu
-mocks.js-dependencies/desktop-config
-mocks.js-dependencies/react-native-navigation-twopane
-mocks.js-dependencies/react-native-screens
-mocks.js-dependencies/react-native-shake
-mocks.js-dependencies/back-handler
-mocks.js-dependencies/react
-mocks.js-dependencies/react-navigation-native
-mocks.js-dependencies/react-navigation-stack
-mocks.js-dependencies/react-navigation-bottom-tabs
-mocks.js-dependencies/react-native-haptic-feedback
-mocks.js-dependencies/mock
-quo.previews.main/init
-legacy.status-im.chat.models.message-list-test/descending-range
-legacy.status-im.chat.models.message-list-test/random-range
-legacy.status-im.ethereum.eip165/supports?
-legacy.status-im.utils.hex/valid-hex?
-legacy.status-im.multiaccounts.core/chat-send?
-legacy.status-im.hardwallet.simulated-keycard/install-cash-applet
-legacy.status-im.hardwallet.simulated-keycard/sign-typed-data
-legacy.status-im.utils.core/safe-read-message-content
-legacy.status-im.ui.components.react/native-modules
-legacy.status-im.ui.components.react/progress-bar
-react-native.fs/move-file
-react-native.fs/read-dir
-react-native.fs/mkdir
-react-native.fs/unlink
-react-native.fs/file-exists?
-legacy.status-im.ui.components.colors/white
-legacy.status-im.ui.components.colors/black
-legacy.status-im.ui.components.core/animated-header
-legacy.status-im.ui.components.core/safe-area-provider
-legacy.status-im.ui.components.core/safe-area-consumer
-legacy.status-im.ui.components.core/safe-area-view
-legacy.status-im.utils.universal-links.core/open!
-legacy.status-im.transport.filters.core-test/member-2
-legacy.status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
-legacy.status-im.ethereum.ens/ttl
-legacy.status-im.ethereum.ens/addr-hash
-legacy.status-im.ethereum.ens/name-hash
-legacy.status-im.ethereum.ens/ABI-hash
-legacy.status-im.ethereum.ens/pubkey-hash
-legacy.status-im.network.core/get-network
-status-im.constants/desktop-content-types
-status-im.constants/blocks-per-hour
-status-im.constants/one-earth-day
-status-im.constants/left-pane-min-width
-status-im.constants/system
-status-im.constants/contact-discovery
-status-im.constants/send-transaction-failed-parse-response
-status-im.constants/send-transaction-failed-parse-params
-status-im.constants/send-transaction-no-account-selected
-status-im.constants/send-transaction-invalid-tx-sender
-status-im.constants/web3-get-logs
-status-im.constants/web3-transaction-receipt
-status-im.constants/web3-new-filter
-status-im.constants/web3-new-pending-transaction-filter
-status-im.constants/web3-new-block-filter
-status-im.constants/web3-uninstall-filter
-status-im.constants/web3-get-filter-changes
-status-im.constants/web3-shh-post
-status-im.constants/web3-shh-new-identity
-status-im.constants/web3-shh-has-identity
-status-im.constants/web3-shh-new-group
-status-im.constants/web3-shh-add-to-group
-status-im.constants/web3-shh-new-filter
-status-im.constants/web3-shh-uninstall-filter
-status-im.constants/web3-shh-get-filter-changes
-status-im.constants/web3-shh-get-messages
-status-im.constants/status-create-address
-status-im.constants/event-transfer-hash
-status-im.constants/regx-rtl-characters
-status-im.constants/desktop-msg-chars-hard-limit
-status-im.constants/debug-metrics
-status-im.constants/scan-qr-code
-status-im.constants/ipfs-proto-code
-status-im.constants/swarm-proto-code
-legacy.status-im.multiaccounts.update.publisher/publish-update!
-legacy.status-im.utils.async/task-queue
-legacy.status-im.utils.async/async-periodic-run!
-legacy.status-im.desktop.core/app-root
-legacy.status-im.desktop.core/init
-legacy.status-im.chat.models-test/test-db
-legacy.status-im.ui.components.spacing/padding-vertical
-legacy.status-im.utils.money/percent-change
-utils.debounce/clear-all
-legacy.status-im.transport.db/create-chat
-legacy.status-im.utils.priority-map/priority-map
-legacy.status-im.utils.priority-map/priority-map-by
-legacy.status-im.utils.priority-map/priority-map-keyfn
-legacy.status-im.utils.priority-map/empty-message-map
-legacy.status-im.wallet.choose-recipient.core/use-default-eth-gas
-legacy.status-im.ui.components.animation/decay
-legacy.status-im.ui.components.animation/remove-all-listeners
-legacy.status-im.ui.components.animation/stop-animation
-legacy.status-im.ui.components.animation/animated
-legacy.status-im.ui.components.animation/add
-legacy.status-im.ui.components.animation/subtract
-legacy.status-im.ui.components.animation/get-layout
-legacy.status-im.wallet.transactions-test/uri-query-data
-legacy.status-im.utils.name/shortened-name
-legacy.status-im.ui.components.button.haptic/trigger
-legacy.status-im.contact.db/filter-dapps
-legacy.status-im.contact.db/filter-group-contacts
-legacy.status-im.contact.db/legacy-pending?
-legacy.status-im.utils.transducers-test/preview-call-1
-legacy.status-im.utils.transducers-test/preview-call-2
-legacy.status-im.utils.types/to-string
-legacy.status-im.chat.db/datemark?
-legacy.status-im.chat.db/gap?
-legacy.status-im.chat.db/map->sorted-seq
-legacy.status-im.utils.snoopy/status-module-filter
-legacy.status-im.utils.snoopy/websocket-filter
-legacy.status-im.utils.snoopy/touches-filter
-legacy.status-im.utils.snoopy/native-animation-filter
-legacy.status-im.utils.snoopy/keyboard-observer-filter
-legacy.status-im.utils.multihash/hex
-legacy.status-im.utils.multihash/decode-array
@@ -1 +0,0 @@
-{:lint-as {babashka.fs/with-temp-dir clojure.core/let}}
@@ -1 +0,0 @@
-{:hooks {:macroexpand {sci.core/copy-ns sci.core/copy-ns}}}
@@ -1,9 +0,0 @@
-(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)]))
@@ -1,88 +1,6 @@
-{:config-paths ["status-im"]
- :output       {:exclude-files ["src/user.cljs" "src/dev/user.cljs"]}
- :lint-as      {legacy.status-im.utils.views/defview clojure.core/defn
-                legacy.status-im.utils.views/letsubs clojure.core/let
-                reagent.core/with-let                clojure.core/let
-                legacy.status-im.utils.fx/defn       clj-kondo.lint-as/def-catch-all
-                utils.re-frame/defn                  clj-kondo.lint-as/def-catch-all
-                quo.react/with-deps-check            clojure.core/fn
-                quo.previews.preview/list-comp       clojure.core/for
-                legacy.status-im.utils.styles/def    clojure.core/def
-                legacy.status-im.utils.styles/defn   clojure.core/defn
-                test-helpers.unit/deftest-sub        clojure.core/defn
-                test-helpers.unit/deftest-event      clojure.core/defn
-
-                taoensso.tufte/defnp                 clojure.core/defn}
- :linters      {:case-duplicate-test           {:level :error}
-                :case-quoted-test              {:level :error}
-                :case-symbol-test              {:level :error}
-                :clj-kondo-config              {:level :error}
-                :cond-else                     {:level :error}
-                :condition-always-true         {:level :error}
-                :conflicting-alias             {:level :error}
-                :consistent-alias              {:level   :error
-                                                :aliases {clojure.set             set
-                                                          clojure.string          string
-                                                          clojure.walk            walk
-                                                          malli.core              malli
-                                                          malli.dev.pretty        malli.pretty
-                                                          malli.dev.virhe         malli.virhe
-                                                          malli.error             malli.error
-                                                          malli.generator         malli.generator
-                                                          malli.transform         malli.transform
-                                                          malli.util              malli.util
-                                                          promesa.core            promesa
-                                                          schema.core             schema
-                                                          status-im.feature-flags ff
-                                                          taoensso.timbre         log}}
-                :deprecated-namespace          {:level :warning}
-                :docstring-blank               {:level :error}
-                :equals-true                   {:level :error}
-                :inline-def                    {:level :error}
-                :invalid-arity                 {:skip-args [legacy.status-im.utils.fx/defn
-                                                            utils.re-frame/defn]}
-                :loop-without-recur            {:level :error}
-                :minus-one                     {:level :error}
-                :misplaced-docstring           {:level :error}
-                :missing-body-in-when          {:level :error}
-                :missing-clause-in-try         {:level :error}
-                :missing-else-branch           {:level :error}
-                :multiple-async-in-deftest     {:level :error}
-                :not-empty?                    {:level :error}
-                :plus-one                      {:level :error}
-                :redundant-do                  {:level :error}
-                :redundant-let                 {:level :error}
-                :refer-all                     {:level :error}
-                :shadowed-fn-param             {:level :error}
-                :shadowed-var                  {:level   :error
-                                                ;; We temporarily use :include to define an
-                                                ;; allowlist of core Clojure vars. In the
-                                                ;; future, as we progressively fix shadowed
-                                                ;; vars, we should be able to delete this
-                                                ;; option and lint all vars.
-                                                :exclude [type name]}
-                :self-requiring-namespace      {:level :error}
-                :single-operand-comparison     {:level :error}
-                :syntax                        {:level :error}
-                :unbound-destructuring-default {:level :error}
-                :underscore-in-namespace       {:level :error}
-                :uninitialized-var             {:level :error}
-                :unknown-require-option        {:level :error}
-                :unreachable-code              {:level :error}
-                :unresolved-namespace          {:level :error}
-                ;; TODO remove number when this is fixed
-                ;; https://github.com/borkdude/clj-kondo/issues/867
-                :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
-                                                          number
-                                                          legacy.status-im.test-helpers/restore-app-db
-                                                          (cljs.test/is [match-strict?])]}
-                :unresolved-var                {:level :error}
-                :unsorted-required-namespaces  {:level :error}
-                :unused-alias                  {:level :warning}
-                :unused-binding                {:level :error}
-                :unused-import                 {:level :error}
-                :unused-namespace              {:level :error}
-                :unused-private-var            {:level :error}
-                :unused-referred-var           {:level :error}
-                :use                           {:level :error}}
- :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}
+{:lint-as {status-im.utils.views/defview clojure.core/defn
+           status-im.utils.views/letsubs clojure.core/let
+           status-im.utils.fx/defn       clojure.core/defn
+           status-im.utils.styles/def    clojure.core/def
+           status-im.utils.styles/defn   clojure.core/defn}
+ :linters {:invalid-arity {:skip-args [status-im.utils.fx/defn]}}}
@@ -1,9 +0,0 @@
-{:lint-as {promesa.core/->          clojure.core/->
-           promesa.core/->>         clojure.core/->>
-           promesa.core/as->        clojure.core/as->
-           promesa.core/let         clojure.core/let
-           promesa.core/plet        clojure.core/let
-           promesa.core/loop        clojure.core/loop
-           promesa.core/recur       clojure.core/recur
-           promesa.core/with-redefs clojure.core/with-redefs
-           promesa.core/doseq       clojure.core/doseq}}
@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}
@@ -1,4 +0,0 @@
-{:linters
- {:unresolved-symbol
-  {:exclude [(cljs.test/is [match? thrown-match?])
-             (clojure.test/is [match? thrown-match?])]}}}
@@ -1,5 +0,0 @@
-{:lint-as
- {rewrite-clj.zip/subedit-> clojure.core/->
-  rewrite-clj.zip/subedit->> clojure.core/->>
-  rewrite-clj.zip/edit-> clojure.core/->
-  rewrite-clj.zip/edit->> clojure.core/->>}}
@@ -1,21 +0,0 @@
-(ns cljs.test
-  (:require [clj-kondo.hooks-api :as hooks]))
-
-(defn deftest
-  "Verify test name passed to `cljs.test/deftest` is suffixed with -test and not
-  prefixed with test-."
-  [{:keys [node]}]
-  (let [[_ test-name-node & _] (:children node)
-        test-name              (str (hooks/sexpr test-name-node))]
-    (when (and (hooks/token-node? test-name-node)
-               (or (not (re-find #"^.*-test$" test-name))
-                   (re-find #"^test-.*$" test-name)))
-      (hooks/reg-finding! (assoc (meta test-name-node)
-                                 :message "Test name should be suffixed with -test"
-                                 :type    :status-im.linter/inconsistent-test-name)))))
-
-(comment
-  ;; Invalid
-  (deftest {:node (hooks/parse-string "(deftest foo-tes (println :hello))")})
-  (deftest {:node (hooks/parse-string "(deftest test-foo-test (println :hello))")})
-)
@@ -1,11 +0,0 @@
-{:hooks
- {:analyze-call
-  {utils.i18n/label                                     utils.i18n/label
-   test-helpers.component/get-all-by-translation-text   utils.i18n/label
-   test-helpers.component/get-by-translation-text       utils.i18n/label
-   test-helpers.component/query-all-by-translation-text utils.i18n/label
-   test-helpers.component/query-by-translation-text     utils.i18n/label
-
-   cljs.test/deftest                                    cljs.test/deftest}}
- :linters {:status-im.linter/invalid-translation-keyword {:level :error}
-           :status-im.linter/inconsistent-test-name      {:level :error}}}
@@ -1,26 +0,0 @@
-(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)")})
-)
@@ -1 +0,0 @@
-{:hooks {:analyze-call {taoensso.encore/defalias taoensso.encore/defalias}}}
@@ -1,16 +0,0 @@
-(ns taoensso.encore
-  (:require
-   [clj-kondo.hooks-api :as hooks]))
-
-(defn defalias [{:keys [node]}]
-  (let [[sym-raw src-raw] (rest (:children node))
-        src (if src-raw src-raw sym-raw)
-        sym (if src-raw
-              sym-raw
-              (symbol (name (hooks/sexpr src))))]
-    {:node (with-meta
-             (hooks/list-node
-               [(hooks/token-node 'def)
-                (hooks/token-node (hooks/sexpr sym))
-                (hooks/token-node (hooks/sexpr src))])
-             (meta src))}))
@@ -13,7 +13,7 @@ update_configs:
          update_type: "security"
  # Keep /mobile/js_files/yarn.lock up to date, batching pull requests weekly
  - package_manager: "javascript"
-    directory: "/"
+    directory: "/mobile/js_files"
    update_schedule: "weekly"
    allowed_updates:
    - match:
@@ -2,10 +2,14 @@ CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=info
+HARDWALLET_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
@@ -15,24 +19,6 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_PROTOCOL=0
 STATUS_GO_ENABLE_NIMBUS=0
-KEYCARD_TEST_MENU=0
-QR_READ_TEST_MENU=1
-ENABLE_ROOT_ALERT=1
-ENABLE_QUO_PREVIEW=1
-APN_TOPIC=im.status.ethereum.pr
-COMMUNITIES_ENABLED=1
-DATABASE_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-COMMANDS_ENABLED=1
-TWO_MINUTES_SYNCING=1
-SWAP_ENABLED=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
-TEST_STATEOFUS=1
-FAST_CREATE_COMMUNITY_ENABLED=1
-TEST_NETWORKS_ENABLED=1
-SHOW_NOT_IMPLEMENTED_FEATURES=0
-ENABLE_ALERT_BANNER=0
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -1,9 +1,11 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.staging
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
@@ -15,28 +17,7 @@ SNOOPY=0
 STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 BLANK_PREVIEW=0
 TOOLTIP_EVENTS=1
 COMMANDS_ENABLED=1
-KEYCARD_TEST_MENU=1
-QR_READ_TEST_MENU=1
-ENABLE_ROOT_ALERT=0
-APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
-TEST_STATEOFUS=1
-DATABASE_MANAGEMENT_ENABLED=1
-COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1
-TEST_NETWORKS_ENABLED=1
-SHOW_NOT_IMPLEMENTED_FEATURES=1
-DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
-DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
-ENABLE_ALERT_BANNER=0
-FLAG_WALLET_CONNECT_ENABLED=1
-MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
@@ -1,9 +1,13 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
@@ -15,25 +19,5 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_ENABLE_NIMBUS=0
-COMMANDS_ENABLED=1
-KEYCARD_TEST_MENU=0
-ENABLE_ROOT_ALERT=1
-DISABLE_WALLET_ON_MOBILE_NETWORK=1
-APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
-TEST_STATEOFUS=1
-BLANK_PREVIEW=0
-DATABASE_MANAGEMENT_ENABLED=1
-COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
-ENABLE_QUO_PREVIEW=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1
-TEST_NETWORKS_ENABLED=1
-ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1
@@ -1,9 +1,12 @@
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=info
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -11,16 +14,8 @@ PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-ENABLE_ROOT_ALERT=1
-BLANK_PREVIEW=0
-COMMUNITIES_ENABLED=1
-DATABASE_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=0
-TEST_NETWORKS_ENABLED=0
-ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1
+MOBILE_UI_FOR_DESKTOP=1
+HARDWALLET_ENABLED=1
@@ -1,9 +1,12 @@
 DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-GROUP_CHATS_ENABLED=1
-LOG_LEVEL=
+FLEET=eth.prod
+GROUP_CHATS_ENABLED=0
+LOG_LEVEL_STATUS_GO=
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -11,13 +14,7 @@ PFS_TOGGLE_VISIBLE=0
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-ENABLE_ROOT_ALERT=1
-MAX_IMAGES_BATCH=1
-DELETE_MESSAGE_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=0
-TEST_NETWORKS_ENABLED=0
-STATUS_PROXY_STAGE_NAME=prod
-FLAG_WALLET_CONNECT_ENABLED=1
+MOBILE_UI_FOR_DESKTOP=1
+LOCAL_NOTIFICATIONS=0
@@ -1 +1 @@
-layout node
+layout node
@@ -1,4 +1,4 @@
 module.exports = {
-  root: true,
-  extends: '@react-native',
-};
+    root: true,
+    extends: '@react-native-community',
+  };
@@ -94,4 +94,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

 [version]
-^0.122.0
+^0.105.0
@@ -5,6 +5,8 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
+*       @status-im/status-core
+
 /ci                 @jakubgs
 /fastlane           @jakubgs
 /scripts            @jakubgs
@@ -22,4 +24,12 @@

 /components @status-im/status-core-ui

-/test/appium/ @churik
+desktop/                        @vkjr
+modules/react-native-desktop*/  @vkjr
+modules/react-native-desktop*/  @vkjr
+
+/doc        @oskarth @yenda @jeluard
+
+/deployment @vkjr
+
+/test/appium/    @antdanchenko @churik
@@ -8,9 +8,10 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p

 #### What should I know before I get started?

-* [Mission and Principles](https://status.im/about)
+* [Mission and Core Values](https://status.im/contribute)
+* [Principles](https://status.im/contribute/our_principles.html)
 * [Read our FAQ](https://status.im/docs/FAQs.html)
 * [Join our Chat](http://join.status.im/chat/public/status-core-dev)
 * [Developer Introduction](https://status.im/developer_tools/)
-* [Build Status Yourself](https://status.im/technical/build_status)
+* [Build Status Yourself](https://status.im/build_status)
 * [Find issues to work on](https://github.com/status-im/)
@@ -43,4 +43,4 @@ As a <user|developer|...>, I want to <task> so that <goal>.
 [comment]: # (if on Android please replicate bug whilst running adb logcat)
 ```
 ...
-```
+```
@@ -1,34 +1,54 @@
 ---
-name: MVPBug Report
-about: MVPBug Report
+name: Bug Report
+about: Bug Report
 title: ''
-labels: ['E:Mobile Bug MVP', ':1234: low prio']
+labels: bug
 assignees: ''

 ---

 # Bug Report

+## Problem

-## Problem 
-[comment]: # (A problem description)
-
+An overview of the background required to understand the problem.
+A problem description.

 #### Expected behavior

+[comment]: # (Describe what you expected to happen. Please include designs if possible.)

 #### Actual behavior

+[comment]: # (Describe what actually happened. Please include screenshots if possible.)
+
+#### Notes
+
+For the developer who will be investigating. Is it related to another PR? Tips on where to start? 
+
+#### Acceptance Criteria
+
+Rules for the future PR to be accepted.

 ### Reproduction

-1. 
+[comment]: # (Describe how we can replicate the bug step by step.)
+
+- Open Status
+- ...
+- Step 3, etc.

 ### Additional Information

- Status version: nightly 
- Operating System: Android, iOS
+[comment]: # (Please do your best to fill this out.)
+- Status version: ...
+[comment]: # (Android or iOS.)
+- Operating System: <Android|iOS>

+#### Logs

-[comment]: # (Please, add logs/notes if necessary)
+[comment]: # (if on Android please replicate bug whilst running adb logcat)

+```
+...
+```
@@ -1,77 +0,0 @@
---
-name: Release umbrella issue
-about: Release Issue
-title: 'Mobile release '
-labels: release
-assignees: ''
-
---
-Issue to manage mobile release <version>
-
-### Scope
-[comment]: # (Add milestone from github)
-https://github.com/status-im/status-mobile/milestone/
-
- release notes: 
- release branch: 
-
-
-### Testing info 
-[comment]: # (TestRail info, added by QA)
-Main test suite: 
-Upgrade (e2e): 
-
-### Builds in TestFlight and PlayStore to push as a release
-[comment]: # (Will be added by QA after testing approving of build)
-
-### Process
-#### 1) Kick-off
- [ ] 1. Translation PRs is merged before cutting branch (Jinho)
- [ ] 2. Prepare scope of visible changes based on commits history, started from previous release branch cut ([guide](https://notes.status.im/how-to-prepare-release-notes))
- [ ] 3. Update [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) with release notes (make PR based on previous step)
- [ ] 4. Create release branch using this [guide](https://github.com/status-im/status-mobile/blob/develop/doc/RELEASE_GUIDE.md), bump VERSION (merge created PR ([example](https://github.com/status-im/status-mobile/pull/12504) ) to develop) and get successful release builds (so, testing can be started)
- [ ] 5. Based on release scope, ask for comms (Jonny) 
- [ ] 6. Make sure that assets (screenshots, video) in stores are up-to-date, more info [here](https://notes.status.im/how-to-update-assets)
-
-#### 2) Testing
-[comment]: # (Section will be maintained by QA)
- [ ] Dogfooding (add notes, if it was held) 
- [ ] Regression testing for release candidate build
- [ ] Upgrade tests
- [ ] Fix known blocker(s) found during regression testing
-
-##### Blockers
-[comment]: # (Section for blocker issues; should be fixed and merged by release-manager. Remove if no blockers found)
- [ ] 1 blocker:
-
-=============================================================================================
-
- [ ] Cherry-pick fix(es) to the release branch
- [ ] Verify fix(es) on new release candidate build
- [ ] Retest
- [ ] Keep release build forever (button in Jenkins)
-
-#### 3) Submission
-
- [ ] 1. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-mobile/blob/develop/doc/FDROID.md))
- [ ] 2. Release notes written and added (500 character limit for updates (Android) and PR for [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) is ready to be merged (from 1.3 step)
- [ ] 3. Submit beta version for Android (Open Testing in Play Store)
- [ ] 4. Submit iOS build to Apple review ([instruction](https://drive.google.com/file/d/10Cl7PBB7TFPkZiVbfzdFGpfMRP9bxXuq/view?usp=sharing), be careful - low quality of audio)
- [ ] 5. Play store content reviewed and updated
- [ ] 6. Privacy policy reviewed and updated (ask in channel)
- [ ] 7. Countries to be excluded (ask in channel) 
- [ ] 8. Changes to our FAQ made (should be checked and if any changes needed, ask Jakub to made them)
-
-
-#### 4) Before publishing
- [ ] 1. Translations for comms available (marketing, ask in the channel)
- [ ] 2. Promotional content ready (marketing, ask in channel)
- [ ] 3. Upload builds for DO store,  https://dev.status.im/ (Jakub)
-
-#### 5) At time of publishing
- [ ] 1. Notify marketing to push comms and blog post (Jonny + get review on blog from QA team)
- [ ] 2. Publish release to app store and playstore
- [ ] 3. Final push to update prod site https://status.im/,  [instructions](https://github.com/status-im/infra-docs/blob/master/articles/status_release_upload.md) (Jakub - requires credentials to upload) 
- [ ] 4. Add the link to the post about the release and publish the release: https://github.com/status-im/status-mobile/releases (Jakub)
- [ ] 5. Merge PR for updating [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) (from 1.3 step)
-
@@ -1,30 +0,0 @@
---
-name: Wont fix Report 
-about: to facilitate future handling, identify and address non-urgent issues that won't be prioritized in the near future
-title: ''
-labels: likely_wont_fix
-assignees: ''
-
---
-
-## Problem
-
-
-#### Expected behavior
-
-
-#### Actual behavior
-
-
-### Reproduction
-
-1. 
-
-### Additional Information
-
- Status version: release 
- Operating System: Android, iOS
-
-
-[comment]: # (Please, add logs/notes if necessary)
-
@@ -63,26 +63,4 @@ Documentation change PR (review please): https://github.com/status-im/status.im/

 <!-- (PRs will only be accepted if squashed into single commit.) -->

-### Before and after screenshots comparison
-
-| Figma (if available) | iOS (if available)    | Android (if available)
-| --- | --- | --- |
-| Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after. |
-
 status: ready <!-- Can be ready or wip -->
-
-<!-- Uncomment this section for status-go upgrade/dogfooding pull requests
-
- Specify potentially impacted user flows in _Areas that maybe impacted*.
- Ensure that _Steps to test_ is filled in.
-
-### Risk
-
-Described potential risks and worst case scenarios.
-
-Tick **one**:
- [ ] Low risk: 2 devs MUST perform testing as specified above and attach their results as comments to this PR **before** merging.
- [ ] High risk: QA team MUST perform additional testing in the specified affected areas **before** merging.
-
-
-->
@@ -9,9 +9,21 @@ project-board:
  test-column-name: 'E2E Tests'

 automated-tests:
-  repo-full-name: 'status-im/status-mobile'
-  job-full-name: 'status-mobile/e2e/status-app-prs'
+  repo-full-name: 'status-im/status-react'
+  job-full-name: 'end-to-end-tests/status-app-prs'
  kickoff-column-name: 'E2E Tests'

 github-team:
  slug: 'clojure'
+
+prchecklist:
+  title: Pull Request Checklist
+  checklist:
+    - '**Docs**: Updated the [documentation](https://status.im/build_status/), if affected'
+    - '**Docs**: Added or updated inline comments explaining intention of the code'
+    - '**Tests**: Ensured that all new UI elements have been assigned accessibility IDs'
+    - '**Tests**: Signaled need for E2E tests with label, if applicable'
+    - '**Tests**: Briefly described what was tested and what platforms were used'
+    - '**UI**: In case of UI changes, ensured that UI matches [Figma](https://www.figma.com/)'
+    - '**UI**: In case of UI changes, requested review from a Core UI designer'
+    - '**UI**: In case of UI changes, included screenshots of implementation'
@@ -7,8 +7,6 @@

 # Xcode
 #
-/ios/.xcode.env.local
-/component-spec
 result/
 build/
 *.pbxuser
@@ -27,6 +25,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+xcshareddata

 # Android/IJ
 #
@@ -36,17 +35,13 @@ project.xcworkspace
 **/android/.project
 **/android/.settings/org.eclipse.buildship.core.prefs
 local.properties
-*.hprof
-.cxx/
-*.keystore
-!debug.keystore

 # Atom
 .tags*

 # VS Code
-.vscode/
-workspace.code-workspace
+.vscode/ipch/
+.vscode/settings.json

 # node.js
 #
@@ -73,6 +68,9 @@ env/dev/env/config.cljs
 externs/
 shim.js

+# Desktop build
+index.desktop.js
+
 # Generated by lein voom
 #
 /pom.xml
@@ -83,17 +81,11 @@ shim.js
 figwheel_server.log
 .nrepl-port

-# FlowStorm (Clojure debugger)
-repl-client-debug
-
 # Lein
 #
 .lein-failures
 .lein-repl-history

-# Shadow
-.shadow-cljs
-
 ## Doo
 #
 out
@@ -104,11 +96,9 @@ doo-index.html

 # Status
 Statusgo.framework
-Statusgo.xcframework

 #ios
 /ios/Pods/
-/ios/logs/
 /ios/StatusIm.xcworkspace
 .ruby-version
 status-e2e/
@@ -130,14 +120,15 @@ fastlane/README.md
 # Clj

 .cpcache/
-src/user.cljs
-src/dev/user.cljs

 # emacs
 .dir-locals.el

-# We don't use NPM
+#ignore platform-specific files in the root since they are only symlinks to files in folders 'desktop/js_files' and 'mobile/js_files'
 /package-lock.json
+/package.json
+/metro.config.js
+/yarn.lock
 /.re-natal
 /re-natal

@@ -145,6 +136,27 @@ src/dev/user.cljs
 pkg
 /BUILD_NUMBER

+# Status Desktop
+cmake_install.cmake
+CMakeCache.txt
+**/CMakeFiles/
+/StatusImPackage/*
+*.AppImage
+Status-Windows-x86_64.exe
+/desktop/bin/*
+/desktop/lib/*
+/desktop/modules/*
+/desktop/Makefile
+/desktop/graph_info.json
+/desktop/run-app.bat
+/desktop/run-app.sh
+/desktop/CMakeFiles/
+/desktop/reportApp/Makefile
+/deployment/windows/Status.rc
+*_autogen/
+CompleteBundleWin.cmake
+logger_settings.ini
+
 # Conan
 conan*.txt
 conanbuildinfo.*
@@ -172,33 +184,4 @@ status-modules/resources
 /fiddle/target/
 /fiddle/resources/public/images/

-trace.edn
-
-/app/
-project.clj
-
-##appium
-test/appium/report/
-result.xml
-test/appium/tests/users.py
-
-##node bindings
-/bin/
-/lib/
-
-## visual tests
-/artifacts
-
-/.calva/
-
-## component-tests
-*.log
-
-## local xcode env introduced in react-native 0.69
-.xcode.env.local
-
-## git hooks
-lefthook.yml
-
-## build time logs
-/logs/*.log
+trace.edn
@@ -1 +0,0 @@
-{:clean {:ns-inner-blocks-indentation :keep}}
@@ -1,10 +1,10 @@
 {
  "include": [
-    "target/test/legacy/status_im/**"
+    "target/test/status_im/**"
  ],
  "exclude": [
-    "target/test/legacy/status_im/test/**",
-    "target/test/legacy/status_im/ui/**"
+    "target/test/status_im/test/**",
+    "target/test/status_im/ui/**"
  ],
  "report-dir": "./coverage-report",
  "all": true,
@@ -14,4 +14,4 @@
  "exclude-after-remap": false,
  "extension": [".js"],
  "reporter": ["lcovonly"]
-}
+}
@@ -1,15 +0,0 @@
-/*
-
-# Format top-level js files.
-!*.js
-
-# Ignore all except src/js/**/*.js
-!/src/
-/src/*
-!/src/js
-!/src/js/**/*.js
-
-# Ignore all except translations/en.json
-!/translations/
-/translations/*
-!/translations/en.json
@@ -1,13 +1,6 @@
 module.exports = {
-  arrowParens: 'always',
-  printWidth: 120,
-  semi: true,
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: 'all',
-  useTabs: false,
-
-  // JSON sorting
-  jsonSortOrder: '{ "/.*/": "caseInsensitiveLexical" } ',
-  plugins: ['prettier-plugin-sort-json'],
-};
+    bracketSpacing: false,
+    jsxBracketSameLine: true,
+    singleQuote: true,
+    trailingComma: 'all',
+  };
@@ -1,12 +0,0 @@
-{
-    "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
-}
@@ -0,0 +1,10 @@
+{
+  "files.associations": {
+    "*.android": "groovy",
+    "*.ios": "groovy",
+    "*.linux": "groovy",
+    "*.macos": "groovy",
+    "*.windows": "groovy",
+    "*.nix-cache": "groovy",
+  },
+}
@@ -1,64 +0,0 @@
-;; -*- mode: clojure -*-
-;; vi: ft=clojure
-{:width 105
- :remove {:fn-force-nl #{:noarg1-body}}
-
- :style
- [;; community style https://github.com/kkinnear/zprint/blob/main/doc/reference.md#community
-  :community
-
-  ;; no comma in map
-  :no-comma
-
-  :custom-justify
-
-  ;; respect all newlines https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-nl
-  :respect-nl
-
-  ;; respect blank line https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
-  :respect-bl
-
-  ;; hang multiline left-hand-thing https://github.com/kkinnear/zprint/issues/273
-  :multi-lhs-hang]
-
- :fn-map
- {"reg-sub"           :arg1-pair
-  "h/describe"        :arg1-body
-  "h/describe-skip"   :arg1-body
-  "h/describe-only"   :arg1-body
-  "h/test"            :arg1-body
-  "h/test-skip"       :arg1-body
-  "h/test-only"       :arg1-body
-  "test/async"        :arg1-body
-  "test/use-fixtures" :arg1-body
-  "global.describe"   :arg1-body
-  "global.test"       :arg1-body
-  "list-comp"         :binding
-  "defview"           :arg1-body
-  "letsubs"           :binding
-  "with-let"          "let"
-  "reg-event-fx"      :arg1-pair
-  "reg-fx"            :arg1-pair
-  "testing"           :arg1-body
-  "deftest-sub"       :arg1-body
-  "deftest-event"     :arg1-body
-  "test-async"        :arg1-body
-  "wait-for"          :arg1-body
-  "with-deps-check"   :arg1-body
-  "schema/=>"         :arg1-body
-  "->"                [:noarg1-body
-                       {:list               {:constant-pair? false :force-nl? false}
-                        :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"              "reset!"
-  "assoc-when"        "assoc"
-  "assoc-some"        "assoc"
-  "conj-when"         "conj"
-  "conj-some"         "conj"}
-
- :style-map
- {:no-comma {:map {:comma? false}}
-  :custom-justify
-  {:doc     "Justify everything using pre-1.1.2 approach"
-   :binding {:justify? true :justify {:max-variance 1000}}
-   :map     {:justify? true :justify {:max-variance 1000}}
-   :pair    {:justify? true :justify {:max-variance 1000}}}}}
@@ -0,0 +1,28 @@
+# new icons
+
+## Export icons
+
+![](./export-icons.gif)
+
+## android
+1. copy files to corresponding directories at `/Users/romanvolosovskyi/clj/status-react/android/app/src/main/res` (one of `drawable-hdpi`, `drawable-mdpi`, `drawable-xhdpi`, `drawable-xxhdpi`, `drawable-xxxhdpi` for corresponding resolution)
+If you only have 3 pngs 1x, 2x and 3x put them in mdpi, xhdpi and xxhdpi 
+3. if necessary, rename file so that filename contains only lower case chars, and dashes instead of hyphens, e.g. `"Icon-Name.png"` should be renamed to `"icon_name.png"`.
+4. In the app `icon_name.png` still can be accessed as `icon-name`, so in order to use can add the next code:
+    ```clojure
+    ;; icon_name.png
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```
+    
+## ios
+1. open xcode (on macos run `open ios/StatusIm.xcworkspace` from project's root dir)
+2. go to `StatusIm/StatusIm/Images.xcassets` in xcode
+![](https://notes.status.im/uploads/upload_be25e49db97cb114ff4aa0c9d94422fa.png)
+3. add images there
+4.  if necessary, rename file so that filename contains only lower case chars, e.g. `"Icon-Name.png"` should be renamed to `"icon-name"`.
+5.  **IMPORTANT** there is no need to replace hyphens with dashes, and if you do so you will need to use names with dashes in both android and ios versions. So use dashes for android resources names and hyphens for ios.
+6.  And now `"icon-name"` can be added in app the same way as it was added for android version
+    ```clojure
+    ;; icon-name
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```
@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-rm
+.PHONY: nix-add-gcroots clean nix-clean disable-githooks react-native-android react-native-ios react-native-desktop test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm

 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -14,17 +14,17 @@ WHITE  := $(shell tput -Txterm setaf 7)
 YELLOW := $(shell tput -Txterm setaf 3)
 RESET  := $(shell tput -Txterm sgr0)
 HELP_FUN = \
-			 %help; \
-			 while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
-			 print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
-			 for (sort keys %help) { \
-				 print "${WHITE}$$_:${RESET}\n"; \
-				 for (@{$$help{$$_}}) { \
-					 $$sep = " " x (32 - length $$_->[0]); \
-					 print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
-				 }; \
-				 print "\n"; \
-			 }
+		   %help; \
+		   while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
+		   print "Usage: make [target]\n\n"; \
+		   for (sort keys %help) { \
+			   print "${WHITE}$$_:${RESET}\n"; \
+			   for (@{$$help{$$_}}) { \
+				   $$sep = " " x (32 - length $$_->[0]); \
+				   print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
+			   }; \
+			   print "\n"; \
+		   }
 HOST_OS := $(shell uname | tr '[:upper:]' '[:lower:]')

 # This can come from Jenkins
@@ -32,38 +32,45 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif

-# We don't want to use /run/user/$UID because it runs out of space too easily.
-export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
-# This has to be specified for both the Node.JS server process and the Qt process.
+# We don't want to use /run/user/$UID because it runs out of space too easilly
+export TMPDIR = /tmp/tmp-status-react-$(BUILD_TAG)
+# this has to be specified for both the Node.JS server process and the Qt process
 export REACT_SERVER_PORT ?= 5001
-# Default metro port used by scripts/run-android.sh.
-export RCT_METRO_PORT ?= 8081
-# Fix for ERR_OSSL_EVP_UNSUPPORTED error.
-export NODE_OPTIONS += --openssl-legacy-provider
-# The path can be anything, but home is usually safest.
-export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore

 # Our custom config is located in nix/nix.conf
-export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
-# Location of symlinks to derivations that should not be garbage collected
-export _NIX_GCROOTS = ./.nix-gcroots
+export NIX_CONF_DIR = $(PWD)/nix
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
-	BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
-	ANDROID_GRADLE_OPTS,ANDROID_ABI_SPLIT,ANDROID_ABI_INCLUDE,\
-	STATUS_GO_SRC_OVERRIDE,STATUS_GO_IPFS_GATEWAY_URL
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE
+export _NIX_ROOT = /nix
+# legacy TARGET_OS variable support
+ifdef TARGET_OS
+export TARGET ?= $(TARGET_OS)
+endif

-# Useful for Android release builds
+# Useful for checking if we are on NixOS
+OS_NAME := $(shell awk -F= '/^NAME/{print $2}' /etc/os-release)
+
+# Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)

+# MacOS root is read-only, read nix/README.md for details
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+export NIX_IGNORE_SYMLINK_STORE=1
+export _NIX_ROOT = /opt/nix
+endif
+
 #----------------
 # Nix targets
 #----------------

-# WARNING: This has to be located right before all the targets.
+# WARNING: This has to be located right before the targets
+ifdef IN_NIX_SHELL
+SHELL := env bash
+else
 SHELL := ./nix/scripts/shell.sh
+endif

-shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
@@ -71,40 +78,32 @@ else
 	@echo "${YELLOW}Nix shell is already active$(RESET)"
 endif

-nix-repl: SHELL := /bin/sh
-nix-repl: ##@nix Start an interactive Nix REPL
-	nix repl default.nix
+nix-gc: ##@nix Garbage collect all packages older than 20 days from /nix/store
+	nix-collect-garbage --delete-old --delete-older-than 20d

-nix-gc-protected: SHELL := /bin/sh
-nix-gc-protected:
-	@echo -e "$(YELLOW)The following paths are protected:$(RESET)" && \
-	ls -1 $(_NIX_GCROOTS) | sed 's/^/ - /'
-
-nix-upgrade: SHELL := /bin/sh
-nix-upgrade: ##@nix Upgrade Nix interpreter to current version.
-	nix/scripts/upgrade.sh
-
-nix-gc: export TARGET := nix
-nix-gc: nix-gc-protected ##@nix Garbage collect all packages older than 20 days from /nix/store
-	nix-store --gc
-
-nix-clean: export TARGET := default
-nix-clean: ##@nix Remove all status-mobile build artifacts from /nix/store
+nix-clean: ##@nix Remove all status-react build artifacts from /nix/store
 	nix/scripts/clean.sh

 nix-purge: SHELL := /bin/sh
-nix-purge: ##@nix Completely remove Nix setup, including /nix directory
-	nix/scripts/purge.sh
+nix-purge: ##@nix Completely remove the complete Nix setup
+ifeq ($(OS_NAME), NixOS)
+	$(error $(RED)You should not purge Nix files on NixOS!$(RESET))
+else
+	sudo rm -rf $(_NIX_ROOT)/* ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
+endif
+
+nix-add-gcroots: export TARGET := default
+nix-add-gcroots: ##@nix Add Nix GC roots to avoid status-react expressions being garbage collected
+	nix/scripts/gcroots.sh

-nix-update-gradle: export TARGET := gradle
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
-	nix/deps/gradle/generate.sh
+	nix/mobile/android/maven-and-npm-deps/maven/generate-nix.sh

-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-lein: export TARGET := lein
+nix-update-lein: ##@nix Update maven nix expressions based on current lein setup
+	nix/tools/lein/generate-nix.sh nix/lein

-nix-update-gems: export TARGET := fastlane
+nix-update-gems: export TARGET := lein
 nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
 	fastlane/update.sh

@@ -121,388 +120,270 @@ _fix-node-perms: ##@prepare Fix permissions so that directory can be cleaned
 	$(shell test -d node_modules && chmod -R 744 node_modules)
 	$(shell test -d node_modules.tmp && chmod -R 744 node_modules.tmp)

-$(TMPDIR): SHELL := /bin/sh
-$(TMPDIR): ##@prepare Create a TMPDIR for temporary files
+_tmpdir-mk: SHELL := /bin/sh
+_tmpdir-mk: ##@prepare Create a TMPDIR for temporary files
 	@mkdir -p "$(TMPDIR)"
 # Make sure TMPDIR exists every time make is called
-_tmpdir-mk: $(TMPDIR)
 -include _tmpdir-mk

 _tmpdir-rm: SHELL := /bin/sh
 _tmpdir-rm: ##@prepare Remove TMPDIR
 	rm -fr "$(TMPDIR)"

-_install-hooks: SHELL := /bin/sh
-_install-hooks: ##@prepare Create prepare-commit-msg git hook symlink
-	@ln -s -f ../../scripts/hooks/prepare-commit-msg .git/hooks
-include _install-hooks
-
-# Remove directories and ignored files
 clean: SHELL := /bin/sh
-clean: _fix-node-perms _tmpdir-rm ios-clean android-clean ##@prepare Remove all output folders
-	git clean -dXf
-
-# Remove directories, ignored and non-ignored files
-purge: SHELL := /bin/sh
-purge: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
+clean: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
 	git clean -dxf

-
 watchman-clean: export TARGET := watchman
 watchman-clean: ##@prepare Delete repo directory from watchman
-	watchman watch-del $${STATUS_MOBILE_HOME}
+	watchman watch-del $${STATUS_REACT_HOME}
+
+disable-githooks: SHELL := /bin/sh
+disable-githooks: ##@prepare Disables lein githooks
+	@rm -f ${env.WORKSPACE}/.git/hooks/pre-commit && \
+	sed -i'~' -e 's|\[rasom/lein-githooks|;; [rasom/lein-githooks|' \
+		-e 's|:githooks|;; :githooks|' \
+		-e 's|:pre-commit|;; :pre-commit|' project.clj; \
+	rm project.clj~

 pod-install: export TARGET := ios
 pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
 	cd ios && pod install; cd --

-FLEETS_FILE := ./resources/config/fleets.json
 update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
 	curl -s https://fleets.status.im/ \
-		| sed 's/"warning": "/"warning": "DO NOT EDIT! /' \
-		> $(FLEETS_FILE)
-	echo >> $(FLEETS_FILE)
+		| jq --indent 4 --sort-keys . \
+		> resources/config/fleets.json

-$(KEYSTORE_PATH): export TARGET := keytool
-$(KEYSTORE_PATH):
+keystore: export TARGET := keytool
+keystore: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
+keystore: ##@prepare Generate a Keystore for signing Android APKs
 	@./scripts/generate-keystore.sh

-keystore: $(KEYSTORE_PATH) ##@prepare Generate a Keystore for signing Android APKs
-
-fdroid-max-watches: SHELL := /bin/sh
-fdroid-max-watches: ##@prepare Bump max_user_watches to avoid ENOSPC errors
-	sysctl fs.inotify.max_user_watches=524288
-
-fdroid-nix-dir: SHELL := /bin/sh
-fdroid-nix-dir: ##@prepare Create /nix directory for F-Droid Vagrant builders
-	mkdir -m 0755 /nix
-	chown vagrant /nix
-
-fdroid-fix-tmp: SHELL := /bin/sh
-fdroid-fix-tmp: ##@prepare Fix TMPDIR permissions so Vagrant user is the owner
-	chown -R vagrant "$(TMPDIR)"
-
-fdroid-build-env: fdroid-max-watches fdroid-nix-dir fdroid-fix-tmp ##@prepare Setup build environment for F-Droud build
-
-fdroid-pr: export TARGET := android-sdk
-fdroid-pr: ##@prepare Create F-Droid release PR
-ifndef APK
-	$(error APK env var not defined)
-endif
-	scripts/fdroid-pr.sh "$(APK)"
-
-xcode-clean: SHELL := /bin/sh
-xcode-clean: XCODE_HOME := $(HOME)/Library/Developer/Xcode
-xcode-clean: ##@prepare Clean XCode derived data and archives
-	rm -fr $(XCODE_HOME)/DerivedData/StatusIm-* $(XCODE_HOME)/Archives/*/StatusIm*
-
-ios-simulator-cache-clean: SHELL := /bin/sh
-ios-simulator-cache-clean: ##@prepare Clean iOS Simulator Caches
-	rm -rf ~/Library/Developer/CoreSimulator/Cache
-
 #----------------
 # Release builds
 #----------------
-release: release-android release-ios ##@build Build release for Android and iOS
+release: release-android release-ios ##@build build release for Android and iOS

-build-fdroid: export BUILD_ENV = prod
-build-fdroid: export BUILD_TYPE = release
-build-fdroid: export ANDROID_ABI_SPLIT = false
-build-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
-build-fdroid: ##@build Build release for F-Droid
-	@scripts/build-android.sh
-
-build-android: export BUILD_ENV ?= prod
-build-android: export BUILD_TYPE ?= nightly
-build-android: export ORG_GRADLE_PROJECT_versionCode ?= $(TMP_BUILD_NUMBER)
-build-android: ##@build Build unsigned Android APK
-	@scripts/build-android.sh
-
-release-android: export TARGET := keytool
+release-android: export TARGET := android
+release-android: export BUILD_ENV ?= prod
+release-android: export BUILD_TYPE ?= nightly
+release-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
-release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-arm64-v8a-release-unsigned.apk
+release-android: export ANDROID_ABI_SPLIT ?= false
+release-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
+release-android: keystore ##@build build release for Android
+	scripts/release-android.sh

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

-jsbundle: SHELL := /bin/sh
-jsbundle: export BUILD_ENV ?= prod
-jsbundle: ##@build Build JavaScript and Clojurescript bundle for iOS and Android
-	nix/scripts/build.sh targets.mobile.jsbundle
+release-desktop: export TARGET ?= $(HOST_OS)
+release-desktop: ##@build build release for desktop release based on TARGET
+	@$(MAKE) jsbundle-desktop && \
+	scripts/copy-translations.sh && \
+	scripts/build-desktop.sh; \
+	$(MAKE) watchman-clean
+
+release-windows-desktop: export TARGET ?= windows
+release-windows-desktop: ##@build build release for windows desktop release
+	@$(MAKE) jsbundle-desktop && \
+	scripts/copy-translations.sh && \
+	scripts/build-desktop.sh; \
+	$(MAKE) watchman-clean
+
+prod-build-android: jsbundle-android ##@legacy temporary legacy alias for jsbundle-android
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-android.$(RESET)"
+
+jsbundle-android: SHELL := /bin/sh
+jsbundle-android: export TARGET ?= android
+jsbundle-android: export BUILD_ENV ?= prod
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojure into index.android.js
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the index.android.js file to the project root
+	@git clean -dxf ./index.$(TARGET).js
+	nix/scripts/build.sh targets.mobile.android.jsbundle && \
+	mv result/index.$(TARGET).js ./
+
+prod-build-ios: jsbundle-ios ##@legacy temporary legacy alias for jsbundle-ios
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-ios.$(RESET)"
+
+jsbundle-ios: export TARGET ?= ios
+jsbundle-ios: export BUILD_ENV ?= prod
+jsbundle-ios: ##@jsbundle Compile JavaScript and Clojure into index.ios.js
+	@git clean -dxf -f ./index.$(TARGET).js && \
+	lein jsbundle-ios && \
+	node prepare-modules.js
+
+prod-build-desktop: jsbundle-desktop ##@legacy temporary legacy alias for jsbundle-desktop
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-desktop.$(RESET)"
+
+jsbundle-desktop: export TARGET ?= $(HOST_OS)
+jsbundle-desktop: export BUILD_ENV ?= prod
+jsbundle-desktop: ##@jsbundle Compile JavaScript and Clojure into index.desktop.js
+	git clean -qdxf -f ./index.desktop.js desktop/ && \
+	lein jsbundle-desktop && \
+	node prepare-modules.js

 #--------------
-# status-go lib
-#--------------
+# REPL
+# -------------

-status-go-android: SHELL := /bin/sh
-status-go-android: ##@status-go Compile status-go for Android app
-	nix/scripts/build.sh targets.status-go.mobile.android
+_watch-%: ##@watch Start development for device
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	$(eval DEVICE := $(word 3, $(subst -, , $@)))
+	clj -R:dev build.clj watch --platform $(SYSTEM) --$(SYSTEM)-device $(DEVICE)

-status-go-ios: SHELL := /bin/sh
-status-go-ios: ##@status-go Compile status-go for iOS app
-	nix/scripts/build.sh targets.status-go.mobile.ios
+watch-ios-real: export TARGET := ios
+watch-ios-real: _watch-ios-real ##@watch Start development for iOS real device

-status-go-library: SHELL := /bin/sh
-status-go-library: ##@status-go Compile status-go for node-js
-	nix/scripts/build.sh targets.status-go.library
+watch-ios-simulator: export TARGET := ios
+watch-ios-simulator: _watch-ios-simulator ##@watch Start development for iOS simulator
+
+watch-android-real: export TARGET := android
+watch-android-real: _watch-android-real ##@watch Start development for Android real device
+
+watch-android-avd: export TARGET := android
+watch-android-avd: _watch-android-avd ##@watch Start development for Android AVD
+
+watch-android-genymotion: export TARGET ?= android
+watch-android-genymotion: _watch-android-genymotion ##@watch Start development for Android Genymotion
+
+watch-desktop: export TARGET ?= $(HOST_OS)
+watch-desktop: ##@watch Start development for Desktop
+	clj -R:dev build.clj watch --platform desktop
+
+desktop-server: export TARGET ?= $(HOST_OS)
+desktop-server:
+	node ubuntu-server.js

 #--------------
-# Watch, Build & Review changes
-#--------------
-
-run-clojure: export TARGET := clojure
-run-clojure: ##@run Watch for and build Clojure changes for mobile
-	yarn shadow-cljs watch mobile
-
-run-metro: export TARGET := clojure
-run-metro: ##@run Start Metro to build React Native changes
-	@scripts/run-metro.sh
-
-run-re-frisk: export TARGET := clojure
-run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
+# Run
+# -------------
+_run-%:
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	npx react-native run-$(SYSTEM)

 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
-# Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
-# https://github.com/status-im/status-mobile/issues/18493
-run-android: export ORG_GRADLE_PROJECT_hermesEnabled := false
-run-android: ##@run Build Android APK and start it on the device
-	@scripts/run-android.sh
+run-android: ##@run Run Android build
+	npx react-native run-android --appIdSuffix debug

-SIMULATOR=iPhone 13
-# TODO: fix IOS_STATUS_GO_TARGETS to be either amd64 or arm64 when RN is upgraded
+run-desktop: export TARGET ?= $(HOST_OS)
+run-desktop: _run-desktop ##@run Run Desktop build
+
+SIMULATOR=
 run-ios: export TARGET := ios
-run-ios: export IOS_STATUS_GO_TARGETS := ios/arm64;iossimulator/amd64
-run-ios: ##@run Build iOS app and start it in on the simulator
-	@scripts/run-ios.sh "${SIMULATOR}"
-
-show-ios-devices: ##@other shows connected ios device and its name
-	xcrun xctrace list devices
-
-# TODO: fix IOS_STATUS_GO_TARGETS to be either amd64 or arm64 when RN is upgraded
-run-ios-device: export TARGET := ios
-run-ios-device: export IOS_STATUS_GO_TARGETS := ios/arm64;iossimulator/amd64
-run-ios-device: ##@run iOS app and start it on the first connected iPhone
-	@scripts/run-ios-device.sh
+run-ios: ##@run Run iOS build
+ifneq ("$(SIMULATOR)", "")
+	npx react-native run-ios --simulator="$(SIMULATOR)"
+else
+	npx react-native run-ios
+endif

 #--------------
 # Tests
 #--------------

-# Get all clojure files, including untracked, excluding removed
-define find_all_clojure_files
-$$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep -E '((\.clj-kondo\/status-im)|(src).*\.clj[sc]?$$)|((\.clj-kondo\/(status-im|config))|(src).*\.edn$$)|shadow-cljs\.edn')
-endef
-
-lint: export TARGET := clojure
-lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
+lint: export TARGET := lein
 lint: ##@test Run code style checks
-	@sh scripts/lint/re-frame-in-quo-components.sh && \
-	sh scripts/lint/direct-require-component-outside-quo.sh && \
-	sh scripts/lint/require-i18n-resource-first.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 && \
-	node_modules/.bin/prettier --check .
+	lein cljfmt check

-# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
-lint-fix: export TARGET := clojure
+lint-fix: export TARGET := lein
 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 ".*/\.clj-kondo/.*|.*/src/status_im/core\.cljs|.*/src/test_helpers/component_tests_preload\.cljs$$" clean-ns && \
-	sh scripts/lint/trailing-newline.sh --fix && \
-	node_modules/.bin/prettier --write .
+	lein cljfmt fix

-shadow-server: export TARGET := clojure
-shadow-server:##@ Start shadow-cljs in server mode for watching
-	yarn shadow-cljs server
+test: export TARGET := lein
+test: ##@test Run tests once in NodeJS
+	lein with-profile test doo node test once

-_test-clojure: export TARGET := clojure
-_test-clojure: export WATCH ?= false
-_test-clojure: status-go-library
-_test-clojure:
-ifeq ($(WATCH), true)
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
-else
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	yarn shadow-cljs compile test && \
-	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
-endif
+test-auto: export TARGET := lein
+test-auto: ##@test Run tests in interactive (auto) mode in NodeJS
+	lein with-profile test doo node test

-test: export SHADOW_OUTPUT_TO := target/test/test.js
-test: export SHADOW_NS_REGEXP := .*-test$$
-test: ##@test Run all Clojure tests
-test: _test-clojure
-
-# Note: we need to override the :output-to and :ns-regexp options because
-# shadow-cljs has a bug where it will not read from the env vars to expand the
-# configuration when the shadow-cljs mobile target is already running.
-test-watch-for-repl: export TARGET := default
-test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
-test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
-test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	rm -f "$$SHADOW_OUTPUT_TO" && \
-	yarn install && shadow-cljs compile mocks && \
-	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		"yarn shadow-cljs watch test --verbose --config-merge '{:output-to \"$(SHADOW_OUTPUT_TO)\" :ns-regexp \"$(SHADOW_NS_REGEXP)\"}'" \
-		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
-
-test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
-test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests\.contract-test).*-test$$
-test-unit: ##@test Run unit tests
-test-unit: _test-clojure
-
-test-integration: export SHADOW_OUTPUT_TO := target/integration_test/test.js
-test-integration: export SHADOW_NS_REGEXP := ^tests\.integration-test.*$$
-test-integration: ##@test Run integration tests
-test-integration: _test-clojure
-
-test-contract: export SHADOW_OUTPUT_TO := target/contract_test/test.js
-test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
-test-contract: ##@test Run contract tests
-test-contract: _test-clojure
-
-test-android: jsbundle
-test-android: export TARGET := android
-test-android: ##@test Android Gradle test
-	cd android && ./gradlew test
-
-test-component-watch: export TARGET := clojure
-test-component-watch: export COMPONENT_TEST := true
-test-component-watch: export BABEL_ENV := test
-test-component-watch: export JEST_USE_SILENT_REPORTER := false
-test-component-watch: ##@ Watch tests and re-run no changes to cljs files
-	@scripts/check-metro-shadow-process.sh
-	rm -rf ./component-spec
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
-
-test-component: export TARGET := clojure
-test-component: export COMPONENT_TEST := true
-test-component: export BABEL_ENV := test
-test-component: export JEST_USE_SILENT_REPORTER := false
-test-component: ##@test Run component tests once in NodeJS
-	@scripts/check-metro-shadow-process.sh
-	rm -rf ./component-spec
-	yarn shadow-cljs compile component-test && \
-	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node
-
-# Reference: https://flow-storm.github.io/flow-storm-debugger/user_guide.html#_debugging_react_native_applications
-run-flow-storm: export SHADOW_CLJS_BUILD_ID := :mobile
-run-flow-storm: export TARGET := clojure
-run-flow-storm: export GDK_DPI_SCALE := 1.0
-run-flow-storm: ##@run Start FlowStorm debugger
-	clj -Sforce -Sdeps '{:deps {com.github.jpmonettas/flow-storm-dbg {:mvn/version "3.7.5"}}}' \
-		-X flow-storm.debugger.main/start-debugger \
-		:port 7888 \
-		:repl-type :shadow \
-		:build-id $(SHADOW_CLJS_BUILD_ID)
+coverage: ##@test Run tests once in NodeJS generating coverage
+	@scripts/run-coverage.sh

 #--------------
 # Other
 #--------------
+react-native-desktop: export TARGET ?= $(HOST_OS)
+react-native-desktop: export _NIX_PURE ?= true
+react-native-desktop: ##@other Start react native packager
+	@scripts/start-react-native.sh

-geth-connect: export TARGET := android-sdk
+react-native-android: export TARGET := android
+react-native-android: export _NIX_PURE ?= true
+react-native-android: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+react-native-ios: export TARGET := ios
+react-native-ios: export _NIX_PURE ?= true
+react-native-ios: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+geth-connect: export TARGET := android-env
 geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545

-ios-clean: SHELL := /bin/sh
-ios-clean: ios-simulator-cache-clean
-ios-clean: ##@prepare Clean iOS build artifacts
-	git clean -dxf -f target/ios
-
-android-clean: SHELL := /bin/sh
 android-clean: ##@prepare Clean Gradle state
-	git clean -dxf -f ./android/app/build; \
-	rm -rf android/.gradle \
-	rm -rf android/build \
-	rm -rf ~/.gradle
+	git clean -dxf -f ./android/app/build
+	[ -d android/.gradle ] && cd android && ./gradlew clean

-
-android-ports: export FLOWSTORM_PORT := 7722
-android-ports: export TARGET := android-sdk
+android-ports: export TARGET := android-env
 android-ports: ##@other Add proxies to Android Device/Simulator
 	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
-	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
 	adb forward tcp:5561 tcp:5561

-android-devices: export TARGET := android-sdk
+android-devices: export TARGET := android-env
 android-devices: ##@other Invoke adb devices
 	adb devices

-android-pull-geth: export TARGET := android-sdk
-android-pull-geth: export VERSION ?= debug
-android-pull-geth:
-	adb pull "/storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log"
-
-android-tail-geth: export TARGET := android-sdk
-android-tail-geth: export VERSION ?= debug
-android-tail-geth:
-	adb shell 'while true; do cat; sleep 1; done < /storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log'
-
-android-clean-geth: export TARGET := android-sdk
-android-clean-geth: export VERSION ?= debug
-android-clean-geth:
-	adb shell 'rm /storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log'
-
-
-android-logcat: export TARGET := android-sdk
-android-logcat: ##@other Read status-mobile logs from Android phone using adb
+android-logcat: export TARGET := android-env
+android-logcat: ##@other Read status-react logs from Android phone using adb
 	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'

-android-install: export TARGET := android-sdk
+android-install: export TARGET := android-env
 android-install: export BUILD_TYPE ?= release
-android-install: ##@other Install APK on device using adb
+android-install:
 	adb install result/app-$(BUILD_TYPE).apk

 _list: SHELL := /bin/sh
 _list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'

-patch-file: export TARGET := default
-patch-file: ##@other Generates patch file for npm deps
-	@scripts/patch-npm-lib.sh
+_unknown-startdev-target-%: SHELL := /bin/sh
+_unknown-startdev-target-%:
+	@ echo "Unknown target device '$*'. Supported targets:"; \
+	${MAKE} _list | grep "watch-" | sed s/watch-/startdev-/; \
+	exit 1

-#--------------
-# REPLs
-#--------------
+_startdev-%: SHELL := /bin/sh
+_startdev-%:
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	$(eval DEVICE := $(word 3, $(subst -, , $@)))
+	@ if [ -z "$(DEVICE)" ]; then \
+		$(MAKE) watch-$(SYSTEM) || $(MAKE) _unknown-startdev-target-$@; \
+	else \
+		$(MAKE) watch-$(SYSTEM)-$(DEVICE) || $(MAKE) _unknown-startdev-target-$@; \
+	fi

-repl-clojure: export TARGET := clojure
-repl-clojure: ##@repl Start Clojure repl for mobile App
-	yarn shadow-cljs cljs-repl mobile
-
-repl-nix: nix-repl ##@repl Start an interactive Nix REPL
-
-#--------------
-# Dev Automation Flows
-#--------------
-
-auto-login: export TARGET := default
-auto-login: ##@auto runs flow for login or onboarding app on simulator/emulator
-	maestro test "maestro/create-account-or-login.yaml"
-
-auto-custom: export TARGET := default
-auto-custom: ##@auto runs any custom maestro automation flow on simulator/emulator
-ifndef FLOW
-	$(error Usage: make automate FLOW=your-maestro-flow-file.yaml)
-endif
-	maestro test "$(FLOW)"
+startdev-android-avd: export TARGET = android
+startdev-android-avd: _startdev-android-avd
+startdev-android-genymotion: export TARGET = android
+startdev-android-genymotion: _startdev-android-genymotion
+startdev-android-real: export TARGET = android
+startdev-android-real: _startdev-android-real
+startdev-desktop: export TARGET ?= $(HOST_OS)
+startdev-desktop: _startdev-desktop
+startdev-ios-real: export TARGET = ios
+startdev-ios-real: _startdev-ios-real
+startdev-ios-simulator: export TARGET = ios
+startdev-ios-simulator: _startdev-ios-simulator
@@ -1,62 +1,52 @@
+
 # Status - a Mobile Ethereum Operating System

-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="80"/>](https://play.google.com/store/apps/details?id=im.status.ethereum)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"/>](https://f-droid.org/packages/im.status.ethereum/)
-
-
-[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 middlemen 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 middle men 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")

 ## Why?

-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 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, and the way we conduct ourselves privately and promote this way of life to a mass audience.
+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 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.
+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 provides us 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.

 ## How to Contribute?

-Go straight to the [docs](doc/) and choose what interests you:
+Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:

- **Developer** Developers are the heart of software and to keep Status beating
-we need all the help we can get! If you're looking to code in ClojureScript or
-Golang then Status is the project for you! We use React Native and there is even
-some Java/Objective-C too! Want to learn more about it? Start by reading our
-[Developer Introduction](doc/starting-guide.md) which guides you
-through the technology stack and start browsing [beginner
-issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20).
-Then you can read how to [Build
-Status](doc/starting-guide.md), which talks about managing
-project dependencies, coding guidelines and testing procedures.
-Check out our [coding guidelines](doc/new-guidelines.md).
+- **Developer**
+Developers are the heart of software and to keep Status beating we need all the help we can get! If you're looking to code in ClojureScript or Golang then Status is the project for you! We use React Native and there is even some Java/Objective-C too!  
+Want to learn more about it? Start by reading our [Developer Introduction](https://status.im/developer_tools/) which guides you through the technology stack and start browsing [beginner issues](https://github.com/status-im/status-react/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20). Then you can read how to [Build Status](https://status.im/build_status/), which talks about managing project dependencies, coding guidelines and testing procedures.

- **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 the long-lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.app/manifesto)
+- **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 [Community Principles](https://status.im/contribute/our_principles.html)

- **Specification / Documentation**
-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.
+- **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, head over to our [docs](https://status.im/docs) 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.
+- **Blog Writing**  
+Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!

- **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 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!
+- **Testers**  
+It's bug hunting season! Status is currently in Alpha and there is sure to be a bunch of learning, [build status from scratch](https://status.im/build_status/) 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-react/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!

- **Security**
+- **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)
-  
+- **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)
+
+## Status API 
+View our [API Docs](https://status.im/developer_tools/status_web_api.html) and learn how to integrate your DApp into Status. You can read more about how to add your DApp to Status [here](https://status.im/developer_tools/add_your_dapp.html).
+
 ## Give me Binaries!

-You can get our Beta builds for both Android and iOS on our [website](https://status.app), through our [nightly builds](https://status.im/nightly/), or by [building it yourself](doc/starting-guide.md).
+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/build_status/).

 ## Core Contributors

@@ -67,8 +57,14 @@ Without the dedication of these outstanding individuals, Status would not exist.

 ## Contact us

-Feel free to email us at [support@status.im](mailto:support@status.im).
+Feel free to email us at [support@status.im](mailto:support@status.im) or better yet, [join our chat](https://join.status.im/chat/public/status).

 ## License

-Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-mobile/blob/develop/LICENSE.md)
+Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-react/blob/develop/LICENSE.md)
+
+## Testing Supported by
+
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)](https://www.browserstack.com/automate/public-build/SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)
+
+[![Coverage Status](https://coveralls.io/repos/github/status-im/status-react/badge.svg?)](https://coveralls.io/github/status-im/status-react)
@@ -0,0 +1,42 @@
+This document MUST be updated everytime a PR has been identified has the source of a bug in develop. The post mortem analysis MUST include: the CAUSE of the bug, the RESOLUTION PROCESS and PREVENTION MEASURES.
+
+
+# "sql: no rows in result set" error on iOS login
+
+## Cause
+
+There were errors in the iOS native code:
+- "loginWithKeycard" method was not implemented
+- "createAndLoginWithKeycard" method was actually used instead of "createAndLogin** which is used for regular account creation without keycard and doesn't have the same final argument
+
+QA process was focused on account creation and login with keycard, and this bug would only appear specifically on iOS when creating an account without keycard and only during the next login. It was therefore a more complex path to reach than what could have been expected from this PR, and it was caused in develop by a developer working on iOS simulator because that is a common path during development.
+
+## Resolution process
+
+- the commit was reverted locally by the developer which fixed the issue localy 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
+
+## Prevention measures
+
+- PRs that change native code should be checked for platform parity:
+  - same methods are created/modified for each platform
+  - test cases in the PR should take these methods in consideration
+
+# Missing labels for en translation
+
+https://github.com/status-im/status-react/issues/9003
+
+## Cause
+
+Unused labels in the application have been listed by QA and an issue created for their removal. The PR was made by an external contributor and it had to be rebased many time because it touched many files and other PRs got merged before this one could be tested. After a last rebase the PR was merged with 100% e2e test but no manual testing.
+
+The reason some translations got deleted despite the fact that they were used is because the `message status` related labels were not explicitly mentioned in the code unlike every other labels. They were built from the actual `message status` and the prefix `status-`.
+
+## Resolution process
+
+The mistake was quickly noticed in develop and an issue created. The fix was to recover the 3 labels that were accidentally deleted. 
+
+## Prevention measures
+
+The code has been changed so that the labels are no longer generated and appear in the code like other labels.
@@ -0,0 +1,50 @@
+# Description
+
+This document provides information on how to start developing Status App.
+
+# Getting Started
+
+To start developing start a shell for platform you are interested in.
+```
+make shell TARGET=android
+```
+This step will take a while the first time as it will download all dependencies.
+
+To build the app, your can simply run on of the following:
+```
+make release-android
+make release-ios
+```
+For more `make` targets run `make help`.
+
+# Manual Steps
+
+There are a few manual steps you might want to do in order to start contributing.
+
+## Genymotion Virtualization
+
+Optionally set up Genymotion if you don't want to use Android Virtual Device:
+
+https://www.genymotion.com
+
+## Android Development Environment
+
+You can also setup Android Development Environment + Simulator:
+
+https://facebook.github.io/react-native/docs/getting-started.html
+
+## Configure GitHub Account
+
+The optimal way of pushing to GitHubis using SSH instead of user/pass auth.
+
+It's recommented that you [add your public SSH key to your GitHub account](https://help.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account).
+
+## Configure GPG Keys for signing commits
+
+In order to increase security we require all commits in `status-react` repo to be signed with a GPG key.
+
+Steps:
+1. [Generate a new GPG key](https://help.github.com/en/github/authenticating-to-github/generating-a-new-gpg-key)
+2. [Setup Git to use your GPG key](https://help.github.com/en/github/authenticating-to-github/telling-git-about-your-signing-key)
+3. [Setup Git to sign commits](https://help.github.com/en/github/authenticating-to-github/signing-commits)
+4. [Setup GitHub to validate commits](https://help.github.com/en/github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account)
@@ -0,0 +1,101 @@
+# [DEPRECATED] Undefined is not an object evaluating `register_handler_fx`
+
+## Deprecation note
+
+This type of error should not occur anymore now that we require the namespace in the `fx.cljs` file. 
+
+It can however happen with other macros requiring a cljs namespace. 
+
+The general fix for that type of issue is to have two files for the namespace where your macros are defined, let's say for `my-project.my-macro` namespace you would have: 
+- my_macro.cljs in which you need `(:require-macros my-project.my-macro)` and `(:require my-project.the-namespace-used-in-the-macro)`
+- my_macro.clj in which you define the macro
+
+That way you don't need to use any magical call like `find-ns` or inline `require` with some kind of call only once switch (which was the root cause of another bug in ``defstyle`` macro because the compilation phase at which the evaluation of the switch is done was not properly considered).
+
+You also want to make sure users are using the macro by using a aliased namespace defined in require statement rather than require-macro and refer to the macro directly. Otherwise it won't require the cljs file and the require statement of the namespace in the macroexpension might not be there.
+
+## Stacktrace
+
+```
+13:25:22, Requiring: hi-base32
+13:25:23, Possible Unhandled Promise Rejection (id: 0):
+TypeError: undefined is not an object (evaluating 'status_im.utils.handlers.register_handler_fx')
+eval code
+eval@[native code]
+asyncImportScripts$@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:200728:21
+tryCatch@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26567:23
+invoke@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26742:32
+tryCatch@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26567:23
+invoke@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26643:30
+http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26653:21
+tryCallOne@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:3725:16
+http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:3826:27
+_callTimer@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:28405:17
+_callImmediatesPass@http://localhost:8081/index.bundle?pla<…>
+```
+
+## Cause
+
+- stacktrace mentions `register_handler_fx`, 
+- common cause is when requires have been cleaned up and a require of `status-im.utils.handlers` namespace was removed because it looked like it was unused but was actually used through a fx/defn macro
+
+## Solution
+
+go through known faulty commit looking for deleted requires
+
+
+# Git "unable to access" errors during `yarn install`
+
+## Description
+Developer updates `package.json` file with a new dependency using a GitHub URL. So it looks like this:
+```
+  "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#feature/exportKeyWithPath",
+```
+Afterwards, when running e.g. `make react-native-android`, they might see the following confusing error:
+```
+# macOS
+fatal: unable to access 'https://github.com/siphiuel/react-native-status-keycard.git/': SSL certificate problem: unable to get local issuer certificate
+# Linux
+fatal: unable to access 'https://github.com/status-im/react-native-status-keycard.git/': Could not resolve host: github.com
+info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
+```
+
+## Cause
+`yarn.lock` is not updated to be in sync with `package.json`.
+
+## Solution
+Update yarn.lock file. In order to do this, perform the following steps on a clean `status-react` repo:
+```
+cd status-react
+ln -sf mobile/js_files/package.json .
+ln -sf mobile/js_files/yarn.lock .
+yarn install
+```
+and don't forget to commit updated `yarn.lock` together with `package.json`.
+
+
+# adb server/client version mismatch errors
+
+## Description
+Running some adb commands, e.g. `adb devices` or `make android-ports` (in turn invokes `adb reverse`/`adb forward` commands) may display the following message:
+```
+adb server version (40) doesn't match this client (41); killing...
+```
+or the reverse
+```
+adb server version (41) doesn't match this client (40); killing...
+```
+
+This might cause all kinds of difficult-to-debug errors, e.g.:
+  -  not being able to find the device through `adb devices`
+  -  `make run-android` throwing `com.android.builder.testing.api.DeviceException: com.android.ddmlib.InstallException: device 'device-id' not found.`
+  -  `make run-android` throwing `- Error: Command failed: ./gradlew app:installDebug -PreactNativeDevServerPort=8081 Unable to install /status-react/android/app/build/outputs/apk/debug/app-debug.apk com.android.ddmlib.InstallException: EOF`
+  - dropped CLJS repl connections (that have been enabled previously with the help of `make android-ports`)
+
+## Cause
+System's local adb and Nix's adb differ. As adb include of server/client processes, this can cause subtle version errors that cause adb to kill mismatching server processes.
+
+## Solution
+Always use respective `make` commands, e.g. `make android-ports`, `make android-devices`, etc.
+
+Alternatively, run adb commands only from `make shell TARGET=android` shell. Don't forget the `TARGET=android` env var setting - otherwise `adb` will still be selected from the system's default location. You can double-check this by running `which adb`.
@@ -1 +1 @@
-2.30.0
+1.2.1
@@ -0,0 +1,53 @@
+import re
+
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `cp ~/.android/debug.keystore keystores/debug.keystore`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+lib_deps = []
+create_aar_targets(glob(["libs/*.aar"]))
+create_jar_targets(glob(["libs/*.jar"]))
+
+android_library(
+  name = 'all-libs',
+  exported_deps = lib_deps
+)
+
+android_library(
+  name = 'app-code',
+  srcs = glob([
+    'src/main/java/**/*.java',
+  ]),
+  deps = [
+    ':all-libs',
+    ':build_config',
+    ':res',
+  ],
+)
+
+android_build_config(
+  name = 'build_config',
+  package = 'im.status.ethereum',
+)
+
+android_resource(
+  name = 'res',
+  res = 'src/main/res',
+  package = 'im.status.ethereum',
+)
+
+android_binary(
+  name = 'app',
+  package_type = 'debug',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//android/keystores:debug',
+  deps = [
+    ':app-code',
+  ],
+)
@@ -1,75 +1,110 @@
 apply plugin: "com.android.application"
-apply plugin: "org.jetbrains.kotlin.android"
-apply plugin: "com.facebook.react"

 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"

 import com.android.build.OutputFile
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy

-/*
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
+/**
+ * The react.gradle file registers a task for each build variant:
+ * - bundlePrJsAndAssets
+ * - bundleDebugJsAndAssets
+ * - bundleReleaseJsAndAssets
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // the name of the generated asset file containing your JS bundle
+ *   bundleAssetName: "index.android.bundle",
+ *
+ *   // the entry file for bundle generation
+ *   entryFile: "index.android.js",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
 */
-react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+project.ext.react = [
+    nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
+    entryFile: "index.android.js",
+    enableHermes: true,     // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go
+    bundleInPr: true,
+    inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
+]

-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
+// NOTE: Uncomment if building RN from a fork
+// configurations.all {
+//     exclude group: 'com.facebook.react', module: 'react-native'
+// }

-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    nodeExecutableAndArgs = ["node", "--max-old-space-size=16384" ]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-}
+apply from: "../../node_modules/react-native/react.gradle"

 /**
- * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
+ * Run Proguard to shrink the Java bytecode in release builds.
 */
-def enableProguardInReleaseBuilds = true
+def enableProguardInReleaseBuilds = false

 /**
- * The preferred build flavor of JavaScriptCore (JSC)
+ * The preferred build flavor of JavaScriptCore.
 *
 * For example, to use the international variant, you can use:
 * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
 *
 * The international variant includes ICU i18n library and necessary data
 * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
+ * give correct results when using with locales other than en-US.  Note that
 * this variant is about 6MiB larger per architecture than default.
 */
 def jscFlavor = 'org.webkit:android-jsc:+'
@@ -81,14 +116,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
 * and the benefits of using Hermes will therefore be sharply reduced.
 */
-def enableHermes = hermesEnabled.toBoolean();
-
-def getCommitHash = { ->
-    if (project.hasProperty("commitHash")) {
-        return project.commitHash
-    }
-    return "unknown"
-}
+def enableHermes = project.ext.react.get("enableHermes", false);

 def getVersionCode = { ->
    new ByteArrayOutputStream().withStream { stdOut ->
@@ -107,14 +135,10 @@ def getVersionCode = { ->

 def getVersionName = { ->
    new ByteArrayOutputStream().withStream { stdOut ->
-        // TODO: probably not used, cleanup
        if (project.hasProperty("releaseVersion")) {
            return project.releaseVersion
        }
-        /* Necessary because Android Studio uses wrong PWD.
-         * Is actually absolute directory path of this file. */
-        def configDir = project.projectDir.toString()
-        version = new File(configDir + '/../../VERSION').text
+        version = new File('../VERSION').text
        return version.replaceAll("\\s","")
    }
 }
@@ -135,29 +159,13 @@ def getEnvOrConfig = { varName ->
 }

 android {
-    ndkVersion rootProject.ext.ndkVersion
-
-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdk rootProject.ext.compileSdkVersion
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-
-    // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
-    externalNativeBuild {
-        cmake {
-            // This version must match cmakeVersions inside nix/pkgs/android-sdk/compose.nix
-            version "3.22.1"
-        }
-    }
+    compileSdkVersion rootProject.ext.compileSdkVersion

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }

-    namespace "im.status.ethereum"
    defaultConfig {
        applicationId "im.status.ethereum"
        minSdkVersion rootProject.ext.minSdkVersion
@@ -166,7 +174,6 @@ android {
        versionCode getVersionCode()
        versionName getVersionName()
        missingDimensionStrategy 'react-native-camera', 'general'
-        manifestPlaceholders = [commitHash: getCommitHash()]
        /* this needs to be empty if we want APKs split by ABIs */
        if (!getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()) {
            ndk {
@@ -174,7 +181,6 @@ android {
            }
        }
    }
-
    /**
     * Arbitrary project metadata
     * https://docs.gradle.org/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
@@ -193,12 +199,6 @@ android {
        exclude '/lib/mips64/**'
        exclude '/lib/armeabi/**'

-        pickFirst '**/armeabi-v7a/libc++_shared.so'
-        pickFirst '**/x86/libc++_shared.so'
-        pickFirst '**/arm64-v8a/libc++_shared.so'
-        pickFirst '**/x86_64/libc++_shared.so'
-        pickFirst '**/x86/libjsc.so'
-        pickFirst '**/armeabi-v7a/libjsc.so'

        /** Fix for: Execution failed for task ':app:transformNativeLibsWithStripDebugSymbolForDebug'.
        *   with recent version of ndk (17.0.4754217)
@@ -206,13 +206,9 @@ android {
        doNotStrip '*/mips/*.so'
        doNotStrip '*/mips64/*.so'
    }
-    splits {
-        abi {
-            reset()
-            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
-            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk false
-        }
+    dexOptions {
+        jumboMode true
+        javaMaxHeapSize "8g"
    }
    signingConfigs {
        debug {
@@ -221,32 +217,47 @@ android {
            keyAlias 'androiddebugkey'
            keyPassword 'android'
        }
+        release {
+            /* environment variables take precedence over gradle.properties file */
+            storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
+            storePassword getEnvOrConfig('KEYSTORE_PASSWORD')
+            keyAlias      getEnvOrConfig('KEYSTORE_ALIAS')
+            keyPassword   getEnvOrConfig('KEYSTORE_KEY_PASSWORD')
+        }
+    }
+    splits {
+        abi {
+            reset()
+            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
+            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
+            universalApk true
+        }
    }
    buildTypes {
        debug {
            applicationIdSuffix ".debug"
            debuggable          true
            versionNameSuffix   "-SNAPSHOT"
-            resValue "string", "build_config_package", "im.status.ethereum"
            signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "im.status.ethereum"
        }
        release {
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://facebook.github.io/react-native/docs/signed-apk-android.
            minifyEnabled enableProguardInReleaseBuilds
-            shrinkResources enableProguardInReleaseBuilds
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig null
+            signingConfig signingConfigs.release
        }
        pr {
            initWith release
            applicationIdSuffix ".pr"
            versionNameSuffix   ".pr"
-            debuggable false
+            debuggable          false
            matchingFallbacks = ["release"]
            // necessary to make react-native-config's code generation work
            resValue "string", "build_config_package", "im.status.ethereum"
        }
    }
-
    // applicationVariants are e.g. debug, release
    applicationVariants.all { variant ->
        variant.outputs.each { output ->
@@ -262,7 +273,6 @@ android {
        }
    }

-
    aaptOptions {
        // disable PNG optimization as for some reason it cannot be trusted to provide deterministic output (see https://f-droid.org/en/docs/Reproducible_Builds/)
        cruncherEnabled = false
@@ -274,62 +284,52 @@ android {
 }

 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-    implementation("androidx.core:core-splashscreen:1.0.0")
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.facebook.react:react-native:+"  // From node_modules

    if (enableHermes) {
-        implementation("com.facebook.react:hermes-android")
+      def hermesPath = "../../node_modules/hermes-engine/android/";
+      debugImplementation files(hermesPath + "hermes-debug.aar")
+      releaseImplementation files(hermesPath + "hermes-release.aar")
+      prImplementation files(hermesPath + "hermes-release.aar")
    } else {
-        // https://github.com/status-im/status-mobile/issues/18493
-        // we don't use hermes for debug builds because it crashes too often
-        implementation(jscFlavor)
+      implementation jscFlavor
    }

    // react-native-screens
-    implementation("androidx.appcompat:appcompat:1.1.0-rc01")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02")
-    implementation("androidx.multidex:multidex:2.0.1") // required by status-mobile/android/app/src/main/java/im/status/ethereum/MainApplication.java
-    implementation project(':react-native-blur')
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
+
+    implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
+    implementation project(':react-native-dialogs')
+    // Force using exact RN version instead of relying on gradle dependency resolution
+    // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
+    // NOTE: Uncomment if building RN from a fork
+    //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
    implementation project(':react-native-status')
+    implementation project(':react-native-webview-bridge')
    implementation project(':react-native-status-keycard')
-    implementation("com.github.status-im:function:0.0.1")
-    implementation("com.facebook.fresco:fresco:2.5.0")
-    implementation("com.facebook.fresco:animated-gif:2.5.0")
-    implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
-    implementation("com.google.prefab:cli:2.0.0")
-    implementation("com.android.tools.build:aapt2:8.1.1-10154469")
-}
-
-
-def getLocalNDKDir = { ->
-    def rootDir = project.rootDir
-    def localProperties = new File(rootDir, "local.properties")
-    if (!localProperties.exists()) {
-        return null
-    }
-    Properties properties = new Properties()
-    localProperties.withInputStream { instr ->
-        properties.load(instr)
-    }
-    return properties.getProperty('ndk.dir')
+    implementation 'com.github.status-im:function:0.0.1'
+    implementation 'com.facebook.fresco:fresco:2.0.0'
+    implementation 'com.facebook.fresco:animated-gif:2.0.0'
 }

 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
-task hemroidBuild(type: Exec) {
-    def localNdkDir = getLocalNDKDir()
-    def ndkDir = System.env.ANDROID_NDK_ROOT
-    if (localNdkDir != null) {
-        ndkDir = localNdkDir
-    }

-    def execPath = "$ndkDir/ndk-build"
-    def exec = new File(execPath)
-    if (!exec.exists()) {
-        throw new GradleException("No ndk-build binary found!")
+task hemroidBuild(type: Exec) {
+    def rootDir = project.rootDir
+    def localProperties = new File(rootDir, "local.properties")
+
+    def ndkDir = System.env.ANDROID_NDK
+    if (localProperties.exists()) {
+        Properties properties = new Properties()
+        localProperties.withInputStream { instr ->
+            properties.load(instr)
+        }
+        ndkDir = properties.getProperty('ndk.dir')
    }
-    executable execPath
+    executable "$ndkDir/ndk-build"
 }

 preBuild.dependsOn hemroidBuild
@@ -15,9 +15,6 @@

 # React Native

-keep class com.facebook.hermes.unicode.** { *; }
-keep class com.facebook.jni.** { *; }
-
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
@@ -58,33 +55,9 @@
 -keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**

-# to fix : java.security.KeyStoreException: BKS not found
-keep class org.bouncycastle.** { *; }
-
 # okio

 -keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
-
-# fast-image
-
-keep public class com.dylanvann.fastimage.* {*;}
-keep public class com.dylanvann.fastimage.** {*;}
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public class com.bumptech.glide.annotation.GlideModule
-keep public class * extends com.bumptech.glide.module.AppGlideModule
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
-
-# react-native-config
-# https://github.com/lugg/react-native-config?tab=readme-ov-file#problems-with-proguard
-keep class im.status.ethereum.BuildConfig {*;}
-
-# react-native-navigation
-# to fix : java.lang.ClassCastException: java.lang.Class cannot be cast to java.lang.reflect.ParameterizedType
-# at com.reactnativenavigation.views.element.animators.PropertyAnimatorCreator.getChildClass(Unknown Source:13)
-keep class com.reactnativenavigation.** {*;}
@@ -2,10 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools">

-    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
-    <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>

-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"  android:usesCleartextTraffic="true" />
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
 </manifest>
@@ -1,17 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools"
-          android:installLocation="auto">
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.SEND_MULTIPLE" />
-            <data android:mimeType="*/*" />
-        </intent>
-    </queries>
+          android:installLocation="auto"
+          package="im.status.ethereum">

    <!-- non-dangerous permissions -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.NFC"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -24,35 +17,31 @@
    <uses-feature android:name="android.hardware.camera" />
    <uses-feature android:name="android.hardware.camera.autofocus" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <uses-permission android:name="com.android.vending.BILLING" />
+
+    <!-- these permissions should be removed -->
+    <!-- React Native unnecessary permissions (https://github.com/facebook/react-native/issues/5886) -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>

    <application
            tools:replace="android:allowBackup"
            android:allowBackup="false"
            android:label="@string/app_name"
            android:icon="@mipmap/ic_launcher"
-            android:theme="@style/Theme.AppSplash"
+            android:theme="@style/AppTheme"
            android:name=".MainApplication"
            android:largeHeap="true"
-            android:usesCleartextTraffic="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}"/>
+            android:usesCleartextTraffic="true">
        <activity
                android:name=".MainActivity"
-                android:exported="true"
                android:label="@string/app_name"
-                android:theme="@style/Theme.AppSplash"
                android:screenOrientation="portrait"
                android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
                android:resizeableActivity="false"
                android:launchMode="singleTask">
            <intent-filter>
@@ -70,47 +59,19 @@
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Handles http and https URLs for status.app -->
-                <data android:scheme="http" android:host="status.app" />
-                <data android:scheme="https" android:host="status.app" />
-                <!-- Community paths -->
-                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="https" />
-                <!-- Community channel paths -->
-                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="https" />
-                <!-- User paths -->
-                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="https" />
-                <!-- Private chat paths -->
-                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="https" />
-                <!-- Community request paths -->
-                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="https" />
-                <!-- Group chat paths -->
-                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="https" />
-                <!-- Wallet paths -->
-                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="https" />
+                <data android:scheme="http" android:host="join.status.im" />
+                <data android:scheme="https" android:host="join.status.im" />
            </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-app" />
+                <data android:scheme="status-im" />
                <data android:scheme="ethereum" />
            </intent-filter>
        </activity>
        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service
-            android:name="im.status.ethereum.pushnotifications.ForegroundService"
-            android:foregroundServiceType="specialUse">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="local notifications"/>
-        </service>
+        <service android:name="im.status.ethereum.module.ForegroundService"></service>
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.provider"
@@ -0,0 +1,248 @@
+package im.status.ethereum;
+
+import android.content.Context;
+import android.annotation.TargetApi;
+import androidx.annotation.Nullable;
+import android.app.AlertDialog;
+import android.app.ActivityManager;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import androidx.core.app.ActivityCompat;
+import android.util.Log;
+import android.view.WindowManager;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.provider.Settings;
+import android.os.Bundle;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+
+import com.facebook.react.ReactFragmentActivity;
+import com.facebook.react.ReactActivity;
+import com.facebook.react.modules.core.PermissionListener;
+import org.devio.rn.splashscreen.SplashScreen;
+
+import java.util.Properties;
+import im.status.ethereum.module.StatusThreadPoolExecutor;
+
+public class MainActivity extends ReactFragmentActivity
+        implements ActivityCompat.OnRequestPermissionsResultCallback{
+
+
+    @Nullable private PermissionListener mPermissionListener;
+
+    private static void registerUncaughtExceptionHandler(final Context context) {
+        final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(final Thread thread, final Throwable t) {
+                // High priority, so don't use StatusThreadPoolExecutor
+                new Thread() {
+                    @Override
+                    public void run() {
+                        Looper.prepare();
+
+                        new AlertDialog.Builder(context)
+                                .setTitle("Error")
+                                .setMessage(t.toString())
+                                .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
+                                    public void onClick(final DialogInterface dialog, final int id) {
+                                        dialog.dismiss();
+                                        defaultUncaughtExceptionHandler.uncaughtException(thread, t);
+                                    }
+                                }).show();
+
+                        Looper.loop();
+                    }
+                }.start();
+            }
+        });
+    }
+
+    private ActivityManager getActivityManager() {
+        return (ActivityManager) this.getSystemService(ACTIVITY_SERVICE);
+    }
+
+    private ActivityManager.MemoryInfo getAvailableMemory(final ActivityManager activityManager) {
+        final ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
+        activityManager.getMemoryInfo(memoryInfo);
+        return memoryInfo;
+    }
+
+    protected void configureStatus() {
+        // Required because of crazy APN settings redirecting localhost (found in GB)
+        Properties properties = System.getProperties();
+        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1");
+        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1");
+    }
+
+    private Intent createNotificationSettingsIntent() {
+        final Intent intent = new Intent();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
+        } else {
+            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.setData(Uri.parse("package:" + getPackageName()));
+        }
+        return intent;
+    }
+
+    @Override
+    public void onNewIntent(final Intent intent) {
+        super.onNewIntent(intent);
+        if (intent.getDataString() != null && intent.getData().getScheme().startsWith("app-settings")) {
+          startActivity(createNotificationSettingsIntent());
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        // Make sure we get an Alert for every uncaught exceptions
+        registerUncaughtExceptionHandler(MainActivity.this);
+
+        // Report memory details for this application
+        final ActivityManager activityManager = getActivityManager();
+        Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
+
+        setSecureFlag();
+        SplashScreen.show(this, true);
+        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
+        super.onCreate(null);
+
+        if (!shouldShowRootedNotification()) {
+            configureStatus();
+        } else {
+            AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+                    .setMessage(getResources().getString(R.string.root_warning))
+                    .setPositiveButton(getResources().getString(R.string.root_okay), new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            rejectRootedNotification();
+                            dialog.dismiss();
+                            configureStatus();
+                        }
+                    })
+                    .setNegativeButton(getResources().getString(R.string.root_cancel), new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                            MainActivity.this.finishAffinity();
+                        }
+                    })
+                    .setOnCancelListener(new OnCancelListener() {
+                        @Override
+                        public void onCancel(DialogInterface dialog) {
+                            dialog.dismiss();
+                            MainActivity.this.finishAffinity();
+                        }
+                    })
+                    .create();
+
+            dialog.show();
+        }
+
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                System.loadLibrary("status-logs");
+            }
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(r);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    @Override
+    protected String getMainComponentName() {
+        return "StatusIm";
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Intent intent = new Intent("onConfigurationChanged");
+        intent.putExtra("newConfig", newConfig);
+        this.sendBroadcast(intent);
+    }
+
+    private static final String REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification";
+    private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
+
+    private boolean shouldShowRootedNotification() {
+        if (RootUtil.isDeviceRooted()) {
+            if (userRejectedRootedNotification()) {
+                return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
+            } else return true;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean userRejectedRootedNotification() {
+        SharedPreferences preferences = getPreferences(0);
+        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false);
+    }
+
+    private void rejectRootedNotification() {
+        SharedPreferences preferences = getPreferences(0);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true);
+        editor.commit();
+    }
+
+    private void setSecureFlag() {
+        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final boolean setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public void requestPermissions(String[] permissions, int requestCode, PermissionListener listener) {
+        mPermissionListener = listener;
+        requestPermissions(permissions, requestCode);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
+            mPermissionListener = null;
+        }
+        if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            // Permission has been granted. Start camera preview Activity.
+            com.github.alinz.reactnativewebviewbridge.WebViewBridgeManager.grantAccess(requestCode);
+        }
+    }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Override
+            protected ReactRootView createRootView() {
+                return new RNGestureHandlerEnabledRootView(MainActivity.this);
+            }
+        };
+    }
+}
@@ -1,236 +0,0 @@
-package im.status.ethereum
-
-import android.annotation.TargetApi
-import android.app.ActivityManager
-import android.app.AlertDialog
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.preference.PreferenceManager
-import android.provider.Settings
-import android.util.Log
-import android.view.WindowManager
-import androidx.annotation.Nullable
-import androidx.core.app.ActivityCompat
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.defaults.DefaultReactActivityDelegate
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.react.modules.core.PermissionListener
-import com.reactnativenavigation.NavigationActivity
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView
-import im.status.ethereum.MainApplication
-import im.status.ethereum.module.StatusThreadPoolExecutor
-import java.util.Properties
-
-class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsResultCallback {
-
-    @Nullable
-    private var mPermissionListener: PermissionListener? = null
-    private var keepSplash = true
-    private val SPLASH_DELAY = 3200
-
-    /**
-     * Returns the name of the main component registered from JavaScript. This is used to schedule
-     * rendering of the component.
-     */
-    protected fun getMainComponentName(): String {
-        return "StatusIm"
-    }
-
-    private fun registerUncaughtExceptionHandler(context: Context) {
-        val defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
-        // High priority, so don't use StatusThreadPoolExecutor
-        Thread.setDefaultUncaughtExceptionHandler { thread, t ->
-            Thread {
-                Looper.prepare()
-                AlertDialog.Builder(context)
-                    .setTitle("Error")
-                    .setMessage(t.toString())
-                    .setNegativeButton("Exit") { dialog, id ->
-                        dialog.dismiss()
-                        defaultUncaughtExceptionHandler.uncaughtException(thread, t)
-                    }.show()
-                Looper.loop()
-            }.start()
-        }
-    }
-
-    private fun getActivityManager(): ActivityManager {
-        return getSystemService(ACTIVITY_SERVICE) as ActivityManager
-    }
-
-    private fun getAvailableMemory(activityManager: ActivityManager): ActivityManager.MemoryInfo {
-        val memoryInfo = ActivityManager.MemoryInfo()
-        activityManager.getMemoryInfo(memoryInfo)
-        return memoryInfo
-    }
-
-    protected fun configureStatus() {
-        // Required because of crazy APN settings redirecting localhost (found in GB)
-        val properties = System.getProperties()
-        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1")
-        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1")
-    }
-
-    private fun createNotificationSettingsIntent(): Intent {
-        val intent = Intent()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-        } else {
-            intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-            intent.addCategory(Intent.CATEGORY_DEFAULT)
-            intent.data = Uri.parse("package:$packageName")
-        }
-        return intent
-    }
-
-    private fun tryToEmit(eventName: String, event: WritableMap) {
-        try {
-                (getApplication() as MainApplication).reactNativeHost
-                .getReactInstanceManager()
-                .getCurrentReactContext()
-                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                ?.emit("url", event)
-            } catch (e: Exception) { // we expect NPE on first start, which is OK because we have a fallback
-            }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        if (intent.dataString != null && intent.data!!.scheme!!.startsWith("app-settings")) {
-            startActivity(createNotificationSettingsIntent())
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen();
-        setTheme(R.style.DarkTheme)
-        // Make sure we get an Alert for every uncaught exceptions
-        registerUncaughtExceptionHandler(this)
-
-        // Report memory details for this application
-        val activityManager = getActivityManager()
-        Log.v("RNBootstrap", "Available system memory " + getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.largeMemoryClass + "M")
-
-        setSecureFlag()
-
-        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
-        super.onCreate(null)
-
-        if (!shouldShowRootedNotification()) {
-            configureStatus()
-        } else {
-            val dialog = AlertDialog.Builder(this)
-                .setMessage(resources.getString(R.string.root_warning))
-                .setPositiveButton(resources.getString(R.string.root_okay)) { dialog, which ->
-                    rejectRootedNotification()
-                    dialog.dismiss()
-                    configureStatus()
-                }
-                .setNegativeButton(resources.getString(R.string.root_cancel)) { dialog, which ->
-                    dialog.dismiss()
-                    finishAffinity()
-                }
-                .setOnCancelListener {
-                    it.dismiss()
-                    finishAffinity()
-                }
-                .create()
-
-            dialog.show()
-        }
-
-        val r = Runnable {
-            System.loadLibrary("status-logs")
-
-            // when app is started but the Activity has been destroyed, the deep linking url event is
-            // not emitted when coming back to foreground. This is a workaround. If the problem is
-            // resolved in react-native this code should be removed
-            if (intent.data != null) {
-                val event = Arguments.createMap()
-                event.putString("url", intent.dataString)
-                // on first start emit will (silently) fail, but the regular deep linking handler will work
-                tryToEmit("url", event)
-            }
-        }
-
-        splashScreen.setKeepOnScreenCondition { keepSplash }
-
-        val handler = Handler()
-        handler.postDelayed({ keepSplash = false }, SPLASH_DELAY.toLong())
-
-        StatusThreadPoolExecutor.getInstance().execute(r)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        val intent = Intent("onConfigurationChanged")
-        intent.putExtra("newConfig", newConfig)
-        sendBroadcast(intent)
-    }
-
-    private val REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification"
-    private val FREQUENCY_OF_REMINDER_IN_PERCENT = 5
-
-    private fun shouldShowRootedNotification(): Boolean {
-        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
-            return if (userRejectedRootedNotification()) {
-                (Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT
-            } else true
-        } else {
-            return false
-        }
-    }
-
-    private fun userRejectedRootedNotification(): Boolean {
-        val preferences = getPreferences(0)
-        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false)
-    }
-
-    private fun rejectRootedNotification() {
-        val preferences = getPreferences(0)
-        val editor = preferences.edit()
-        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true)
-        editor.commit()
-    }
-
-    private fun setSecureFlag() {
-        val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
-        val setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-    }
-
-   @TargetApi(Build.VERSION_CODES.M)
-   override fun requestPermissions(permissions: Array<String>, requestCode: Int, listener: PermissionListener) {
-       mPermissionListener = listener
-       super.requestPermissions(permissions, requestCode)
-   }
-
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        if (mPermissionListener != null && mPermissionListener!!.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
-            mPermissionListener = null
-        }
-    }
-}
@@ -0,0 +1,56 @@
+package im.status.ethereum;
+
+import androidx.multidex.MultiDexApplication;
+import android.util.Log;
+import com.facebook.react.PackageList;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
+
+import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.soloader.SoLoader;
+import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
+
+import java.util.List;
+
+import im.status.ethereum.keycard.RNStatusKeycardPackage;
+import im.status.ethereum.module.StatusPackage;
+
+public class MainApplication extends MultiDexApplication implements ReactApplication {
+
+    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+        @Override
+        public boolean getUseDeveloperSupport() {
+            return BuildConfig.DEBUG;
+        }
+
+        @Override
+        protected List<ReactPackage> getPackages() {
+            StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
+            List<ReactPackage> packages = new PackageList(this).getPackages();
+            packages.add(statusPackage);
+            packages.add(new ReactNativeDialogsPackage());
+            packages.add(new RNStatusKeycardPackage());
+            packages.add(new WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1"));
+            return packages;
+        }
+
+        @Override
+        protected String getJSMainModuleName() {
+            return "index.android";
+        }
+    };
+
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return mReactNativeHost;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        SoLoader.init(this, /* native exopackage */ false);
+    }
+}
@@ -1,59 +0,0 @@
-package im.status.ethereum
-
-import android.webkit.WebView
-import androidx.multidex.MultiDexApplication
-import com.facebook.react.PackageList
-import com.facebook.react.ReactApplication
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSIModulePackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.modules.network.OkHttpClientProvider
-import com.reactnativenavigation.NavigationApplication
-import com.reactnativenavigation.react.NavigationReactNativeHost
-import cl.json.RNSharePackage
-import com.reactnativecommunity.blurview.BlurViewPackage
-import im.status.ethereum.keycard.RNStatusKeycardPackage
-import im.status.ethereum.module.StatusPackage
-import im.status.ethereum.pushnotifications.PushNotificationPackage
-import im.status.ethereum.StatusOkHttpClientFactory
-
-class MainApplication : NavigationApplication() {
-
-    private val mReactNativeHost = object : NavigationReactNativeHost(this) {
-        override fun getUseDeveloperSupport(): Boolean {
-            return BuildConfig.DEBUG
-        }
-
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-          // Packages that cannot be autolinked yet can be added manually here
-          add(StatusPackage(RootUtil.isDeviceRooted()))
-          add(RNStatusKeycardPackage())
-          add(PushNotificationPackage())
-          add(BlurViewPackage())
-        }
-
-        override fun getJSMainModuleName(): String = "index"
-
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
-
-    override val reactNativeHost: ReactNativeHost
-        get() = mReactNativeHost
-
-    override fun onCreate() {
-        super.onCreate()
-
-        OkHttpClientProvider.setOkHttpClientFactory(StatusOkHttpClientFactory())
-
-        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1")
-
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
-            DefaultNewArchitectureEntryPoint.load()
-        }
-    }
-}
@@ -1,88 +0,0 @@
-package im.status.ethereum
-
-import android.util.Log
-import com.facebook.react.modules.network.OkHttpClientFactory
-import com.facebook.react.modules.network.OkHttpClientProvider
-import okhttp3.OkHttpClient
-import okhttp3.tls.HandshakeCertificates
-import java.io.ByteArrayInputStream
-import java.lang.RuntimeException
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
-import im.status.ethereum.module.StatusPackage
-
-class StatusOkHttpClientFactory : OkHttpClientFactory {
-
-    companion object {
-        private const val TAG = "StatusOkHttpClientFactory"
-        private const val SLEEP_DURATION = 500L // milliseconds
-    }
-
-    override fun createNewNetworkModuleClient(): OkHttpClient? {
-        val certPem = getCertificatePem().takeIf { it.isNotEmpty() }
-            ?: return logAndReturnNull("Certificate is empty, cannot create OkHttpClient without a valid certificate")
-
-        val cert = try {
-            induceSleep()
-            // Convert PEM certificate string to X509Certificate object
-            CertificateFactory.getInstance("X.509")
-                .generateCertificate(ByteArrayInputStream(certPem.toByteArray())) as? X509Certificate
-                ?: return logAndReturnNull("Certificate could not be parsed as non-null")
-        } catch (e: Exception) {
-            return logAndReturnNull("Could not parse certificate", e)
-        }
-
-        val clientCertificates = try {
-            induceSleep()
-            // Create HandshakeCertificates object with our certificate
-            HandshakeCertificates.Builder()
-                .addPlatformTrustedCertificates()
-                .addTrustedCertificate(cert)
-                .build()
-        } catch (e: Exception) {
-            return logAndReturnNull("Could not build HandshakeCertificates", e)
-        }
-
-        return try {
-            OkHttpClientProvider.createClientBuilder()
-                .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager)
-                .build()
-        } catch (e: Exception) {
-            logAndReturnNull("Could not create OkHttpClient", e)
-        }
-    }
-
-    private fun getCertificatePem(): String {
-        return try {
-            // Create OkHttpClient with custom SSL socket factory and trust manager
-            StatusPackage.getImageTLSCert().takeIf { !it.isNullOrBlank() }
-                ?: logAndReturnEmpty("Certificate PEM string is null or empty")
-        } catch (e: Exception) {
-            logAndReturnEmpty("Could not getImageTLSCert", e)
-        }
-    }
-
-    private fun induceSleep() {
-        try {
-            // induce half second sleep because sometimes a cert is not immediately available
-            // TODO : remove sleep if App no longer crashes on Android 10 devices with
-            // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-            Thread.sleep(SLEEP_DURATION)
-        } catch (e: InterruptedException) {
-            Log.e(TAG, "Sleep interrupted", e)
-        }
-    }
-
-    private fun logAndReturnNull(message: String, e: Exception? = null): Nothing? {
-        Log.e(TAG, message, e)
-        return null
-    }
-
-    private fun logAndReturnEmpty(message: String, e: Exception? = null): String {
-        Log.e(TAG, message, e)
-        return ""
-    }
-}
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yenda	464ad4d64c	fix ens contenthash resolution Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>	2020-04-02 14:27:36 +02:00
yenda	e6da69be7f	fix ens contenthash resolution Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>	2020-04-02 14:27:33 +02:00
Andrey Shovkoplyas	93f17d0deb	1.2.1	2020-04-02 14:26:24 +02:00
André Medeiros	b76fa535d9	Fix camera usage description (#10263 ) * Fix camera usage description * Remove contacts usage description as we never access those	2020-04-01 13:21:18 -04:00
Andrea Maria Piana	2a755e07dd	Upgrade status-go Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2020-03-30 15:52:46 +02:00
Andrea Maria Piana	975b749348	Enable waku node default Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2020-03-30 11:06:01 +02:00
jakub	85f65a60d3	use the proper source of publish method Signed-off-by: Jakub Sokołowski <jakub@status.im>	2020-03-25 17:10:50 +01:00
jakub	3337d9f77a	Revert "ci: re-add Play Store upload case for release" This reverts commit `5f9accaa24`.	2020-03-25 16:46:21 +01:00
Roman Volosovskyi	cfe748cdeb	[#10197 ] More retries when requesting balances	2020-03-25 16:24:58 +01:00
Gheorghe Pinzaru	68e453b549	Fix android tabbar animation Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>	2020-03-25 14:17:32 +01:00
jakub	5f9accaa24	ci: re-add Play Store upload case for release Signed-off-by: Jakub Sokołowski <jakub@status.im>	2020-03-25 11:21:26 +01:00
Andrey Shovkoplyas	3ece671048	1.2.0	2020-03-25 09:43:49 +01:00
				`@@ -1 +0,0 @@`
				`{:lint-as {babashka.fs/with-temp-dir clojure.core/let}}`
				`@@ -1 +0,0 @@`
				`{:hooks {:macroexpand {sci.core/copy-ns sci.core/copy-ns}}}`
				`@@ -1 +0,0 @@`
				`{:hooks {:analyze-call {taoensso.encore/defalias taoensso.encore/defalias}}}`
				`@@ -1 +0,0 @@`
				`{:clean {:ns-inner-blocks-indentation :keep}}`
@@ -1 +1 @@
 .30.0
 .2.1