Update snx/synth contract

The env variable `INFURA_TOKEN` is used at build time of JS bundle, not
the final APK file. We never passed the `secretsFile` to the
derivation for JS bundle so it never saw the `INFURA_TOKEN`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>

.carve_ignore

@@ -0,0 +1,237 @@
+status-im.utils.build/warning-handler
+status-im.utils.build/get-current-sha
+status-im.ethereum.resolver/name
+status-im.chat.constants/spacing-char
+status-im.chat.constants/arg-wrapping-char
+status-im.ios.core/init
+status-im.ui.components.camera/aspects
+status-im.ui.components.camera/capture-targets
+status-im.ui.components.camera/set-torch
+status-im.ui.components.camera/request-access-ios
+status-im.chat.models.message-content/stylings
+status-im.chat.models.message-content/actions
+status-im.chat.models.message-content/blank-string
+status-im.chat.models.message-content/sorted-ranges
+status-im.ethereum.mnemonic/words->passphrase
+status-im.native-module.core/listener
+status-im.native-module.core/multiaccount-reset
+status-im.native-module.core/extract-group-membership-signatures
+status-im.native-module.core/sign-group-membership
+status-im.native-module.core/update-mailservers
+status-im.ethereum.abi-spec/bytes-to-hex
+status-im.android.core/init
+status-im.chat.models.message/transport-keys
+status-im.utils.datetime/week
+status-im.utils.datetime/time-ago
+status-im.utils.datetime/format-date
+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
+status-im.multiaccounts.create.core/get-new-key-code
+status-im.ethereum.decode/string
+status-im.network.ui.views/mainnet?
+status-im.data-store.chats/event->string
+status-im.mailserver.constants/seven-days
+status-im.mailserver.constants/connection-timeout
+status-im.hardwallet.card/install-applet
+status-im.hardwallet.card/install-cash-applet
+status-im.multiaccount.login.data-test/all-contacts
+status-im.multiaccount.login.data-test/multiaccounts
+status-im.multiaccount.login.data-test/get-chats
+status-im.multiaccount.login.data-test/transport
+status-im.multiaccount.login.data-test/topics
+status-im.utils.utils/clear-timeout
+status-im.utils.handlers/logged-in
+status-im.multiaccounts.model/credentials
+status-im.multiaccounts.login.core/contract-fleet?
+status-im.multiaccounts.login.core/fetch-nodes
+status-im.utils.config/rpc-networks-only?
+status-im.utils.config/waku-enabled?
+status-im.utils.pairing/has-paired-installations?
+status-im.tribute-to-talk.core-test/user-cofx
+quo.gesture-handler/tap-gesture-handler
+quo.gesture-handler/pan-gesture-handler
+quo.gesture-handler/long-press-gesture-handler
+quo.gesture-handler/pure-native-button
+quo.gesture-handler/createNativeWrapper
+quo.gesture-handler/animated-raw-button
+quo.gesture-handler/states
+mocks.js-dependencies/action-button
+mocks.js-dependencies/camera
+mocks.js-dependencies/dismiss-keyboard
+mocks.js-dependencies/emoji-picker
+mocks.js-dependencies/i18n
+mocks.js-dependencies/qr-code
+mocks.js-dependencies/svg
+mocks.js-dependencies/vector-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
+status-im.chat.models.message-list-test/descending-range
+status-im.chat.models.message-list-test/random-range
+status-im.ethereum.eip165/supports?
+status-im.utils.hex/valid-hex?
+status-im.multiaccounts.core/chat-send?
+status-im.hardwallet.simulated-keycard/install-cash-applet
+status-im.hardwallet.simulated-keycard/sign-typed-data
+status-im.utils.core/safe-read-message-content
+status-im.ui.components.react/native-modules
+status-im.ui.components.react/progress-bar
+status-im.utils.fs/move-file
+status-im.utils.fs/read-dir
+status-im.utils.fs/mkdir
+status-im.utils.fs/unlink
+status-im.utils.fs/file-exists?
+quo.animated/code
+quo.animated/eq
+quo.animated/neq
+quo.animated/greater-or-eq
+quo.animated/not*
+quo.animated/or*
+quo.animated/and*
+quo.animated/add
+quo.animated/sub
+quo.animated/multiply
+quo.animated/abs
+quo.animated/min*
+quo.animated/max*
+quo.animated/set
+quo.animated/start-clock
+quo.animated/stop-clock
+quo.animated/bezier
+quo.animated/linear
+quo.animated/set-value
+quo.animated/clock
+quo.animated/debug
+quo.animated/log
+quo.animated/event
+quo.animated/on-change
+quo.animated/cond*
+quo.animated/block
+quo.animated/call*
+quo.animated/timing
+quo.animated/spring
+quo.animated/clamp
+quo.animated/with-spring
+quo.animated/with-timing
+quo.animated/re-timing
+quo.design-system.colors/white
+quo.design-system.colors/black
+status-im.transport.core-test/messages
+status-im.ethereum.core/sidechain?
+status-im.ethereum.core/network-with-upstream-rpc?
+status-im.ethereum.core/current-address
+status-im.ethereum.core/network->network-name
+status-im.ethereum.core/estimate-gas
+quo.core/animated-header
+quo.core/safe-area-provider
+quo.core/safe-area-consumer
+quo.core/safe-area-view
+status-im.utils.universal-links.core/open!
+status-im.transport.filters.core-test/member-2
+status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
+status-im.ethereum.ens/ttl
+status-im.ethereum.ens/addr-hash
+status-im.ethereum.ens/name-hash
+status-im.ethereum.ens/ABI-hash
+status-im.ethereum.ens/pubkey-hash
+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
+status-im.multiaccounts.update.publisher/publish-update!
+status-im.utils.async/task-queue
+status-im.utils.async/async-periodic-run!
+status-im.desktop.core/app-root
+status-im.desktop.core/init
+status-im.chat.models-test/test-db
+quo.design-system.spacing/padding-vertical
+status-im.utils.money/percent-change
+status-im.utils.platform/isMacOs?
+status-im.utils.platform/isNix?
+status-im.utils.platform/isWin?
+status-im.utils.platform/android-version>=
+status-im.utils.debounce/clear-all
+status-im.transport.db/create-chat
+status-im.utils.priority-map/priority-map
+status-im.utils.priority-map/priority-map-by
+status-im.utils.priority-map/priority-map-keyfn
+status-im.utils.priority-map/empty-message-map
+status-im.wallet.choose-recipient.core/use-default-eth-gas
+status-im.ui.components.animation/decay
+status-im.ui.components.animation/remove-all-listeners
+status-im.ui.components.animation/stop-animation
+status-im.ui.components.animation/animated
+status-im.ui.components.animation/add
+status-im.ui.components.animation/subtract
+status-im.ui.components.animation/get-layout
+status-im.wallet.transactions-test/uri-query-data
+quo.react-native/touchable-highlight
+status-im.utils.name/shortened-name
+status-im.ui.components.button.haptic/trigger
+status-im.contact.db/filter-dapps
+status-im.contact.db/filter-group-contacts
+status-im.contact.db/legacy-pending?
+status-im.utils.transducers-test/preview-call-1
+status-im.utils.transducers-test/preview-call-2
+status-im.utils.types/to-string
+status-im.chat.db/datemark?
+status-im.chat.db/gap?
+status-im.chat.db/map->sorted-seq
+status-im.utils.snoopy/status-module-filter
+status-im.utils.snoopy/websocket-filter
+status-im.utils.snoopy/touches-filter
+status-im.utils.snoopy/native-animation-filter
+status-im.utils.snoopy/keyboard-observer-filter
+status-im.utils.multihash/hex
+status-im.utils.multihash/decode-array

.clj-kondo/config.edn

@@ -1,6 +1,12 @@
-{: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]}}}
+{:lint-as {status-im.utils.views/defview  clojure.core/defn
+           status-im.utils.views/letsubs  clojure.core/let
+           status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
+           quo.react/with-deps-check      clojure.core/fn
+           quo.previews.preview/list-comp clojure.core/for
+           status-im.utils.styles/def     clojure.core/def
+           status-im.utils.styles/defn    clojure.core/defn
+           taoensso.tufte/defnp           clojure.core/defn}
+ :linters {:invalid-arity     {:skip-args [status-im.utils.fx/defn]}
+           ;;TODO remove number when this is fixed
+           ;;https://github.com/borkdude/clj-kondo/issues/867
+           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY number]}}}

.env

@@ -7,9 +7,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
@@ -19,6 +17,11 @@ 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_REFERRAL_INVITE=1
+ENABLE_QUO_PREVIEW=1
+APN_TOPIC=im.status.ethereum.pr

.env.e2e

@@ -3,10 +3,9 @@ DEFAULT_NETWORK=testnet_rpc
 ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=eth.staging
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -17,7 +16,11 @@ 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
+ENABLE_REFERRAL_INVITE=1
+APN_TOPIC=im.status.ethereum.pr

.env.jenkins

@@ -6,9 +6,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -19,5 +17,9 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_ENABLE_NIMBUS=0
+KEYCARD_TEST_MENU=0
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1
+DISABLE_WALLET_ON_MOBILE_NETWORK=1
+APN_TOPIC=im.status.ethereum.pr

.env.nightly

@@ -5,8 +5,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -17,5 +16,5 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
-HARDWALLET_ENABLED=1
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1

.env.release

@@ -4,9 +4,8 @@ ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 FLEET=eth.prod
-GROUP_CHATS_ENABLED=0
-LOG_LEVEL_STATUS_GO=
-LOG_LEVEL=info
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -16,5 +15,5 @@ POW_TIME=1
 SNOOPY=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-MOBILE_UI_FOR_DESKTOP=1
-LOCAL_NOTIFICATIONS=0
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=0

.github/github-bot.yml

@@ -15,15 +15,3 @@ automated-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'

.gitignore

@@ -25,7 +25,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-xcshareddata
 
 # Android/IJ
 #
@@ -68,9 +67,6 @@ env/dev/env/config.cljs
 externs/
 shim.js
 
-# Desktop build
-index.desktop.js
-
 # Generated by lein voom
 #
 /pom.xml
@@ -86,6 +82,9 @@ figwheel_server.log
 .lein-failures
 .lein-repl-history
 
+# Shadow
+.shadow-cljs
+
 ## Doo
 #
 out
@@ -100,6 +99,8 @@ Statusgo.framework
 #ios
 /ios/Pods/
 /ios/StatusIm.xcworkspace
+/ios/react-native-xcode.log
+/ios/set_xcode_version.log
 .ruby-version
 status-e2e/
 
@@ -124,11 +125,8 @@ fastlane/README.md
 # emacs
 .dir-locals.el
 
-#ignore platform-specific files in the root since they are only symlinks to files in folders 'desktop/js_files' and 'mobile/js_files'
+# We don't use NPM
 /package-lock.json
-/package.json
-/metro.config.js
-/yarn.lock
 /.re-natal
 /re-natal
 
@@ -136,27 +134,6 @@ fastlane/README.md
 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.*
@@ -184,4 +161,7 @@ status-modules/resources
 /fiddle/target/
 /fiddle/resources/public/images/
 
-trace.edn
+trace.edn
+
+/app/
+project.clj

DEPENDENCIES.md

@@ -122,10 +122,6 @@ used to get user language and interact with i18n.js
 
 used to send email to support when phone is shaked
 
-## "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status"
-
-used by desktop
-
 ## "react-native-screens": "1.0.0-alpha.22"
 
 used by react-navigation
@@ -152,7 +148,7 @@ TODO: updating requires a pod update on iOS
 
 used for touch-id identification
 
-## "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/classnames-colision"
+## "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_3"
 
 used for browser
 

ICONS.md

@@ -1,28 +0,0 @@
-# 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 ...}] 
-    ```

Makefile

@@ -1,4 +1,4 @@
-.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
+.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm
 
 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -16,7 +16,7 @@ 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\n"; \
+		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
 		   for (sort keys %help) { \
 			   print "${WHITE}$$_:${RESET}\n"; \
 			   for (@{$$help{$$_}}) { \
@@ -39,16 +39,10 @@ export REACT_SERVER_PORT ?= 5001
 
 # Our custom config is located in nix/nix.conf
 export NIX_CONF_DIR = $(PWD)/nix
+# Location of symlinks to derivations that should not be garbage collected
+export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-react
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
 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 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)
@@ -57,7 +51,6 @@ TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 export NIX_IGNORE_SYMLINK_STORE=1
-export _NIX_ROOT = /opt/nix
 endif
 
 #----------------
@@ -78,32 +71,36 @@ else
 	@echo "${YELLOW}Nix shell is already active$(RESET)"
 endif
 
-nix-gc: ##@nix Garbage collect all packages older than 20 days from /nix/store
-	nix-collect-garbage --delete-old --delete-older-than 20d
+nix-repl: SHELL := /bin/sh
+nix-repl: ##@nix Start an interactive Nix REPL
+	nix repl default.nix
 
+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-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-react build artifacts from /nix/store
 	nix/scripts/clean.sh
 
 nix-purge: SHELL := /bin/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-purge: ##@nix Completely remove Nix setup, including /nix directory
+	nix/scripts/purge.sh
 
+nix-update-gradle: export TARGET := gradle
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
-	nix/mobile/android/maven-and-npm-deps/maven/generate-nix.sh
+	nix/deps/gradle/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-clojure: export TARGET := clojure
+nix-update-clojure: ##@nix Update maven Nix expressions based on current clojure setup
+	nix/deps/clojure/generate.sh
 
-nix-update-gems: export TARGET := lein
+nix-update-gems: export TARGET := default
 nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
 	fastlane/update.sh
 
@@ -138,14 +135,6 @@ watchman-clean: export TARGET := watchman
 watchman-clean: ##@prepare Delete repo directory from watchman
 	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 --
@@ -165,120 +154,73 @@ keystore: ##@prepare Generate a Keystore for signing Android APKs
 #----------------
 release: release-android release-ios ##@build build release for Android and iOS
 
-release-android: export TARGET := android
+release-android: export TARGET := default
 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: export ANDROID_APK_SIGNED ?= true
 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 TARGET := ios
 release-ios: export BUILD_ENV ?= prod
 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
 
-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 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
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojurescript into app directory
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the.js files to the project root
 	nix/scripts/build.sh targets.mobile.android.jsbundle && \
-	mv result/index.$(TARGET).js ./
+	mv result/* ./
 
-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 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
+	yarn shadow-cljs release mobile
 
 #--------------
-# REPL
-# -------------
+# status-go lib
+#--------------
 
-_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-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-ios-real: export TARGET := ios
-watch-ios-real: _watch-ios-real ##@watch Start development for iOS real device
-
-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
+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
 
 #--------------
-# Run
-# -------------
-_run-%:
-	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
-	npx react-native run-$(SYSTEM)
+# 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/start-react-native.sh
+
+run-re-frisk: export TARGET := clojure
+run-re-frisk: ##@run Start re-frisk server
+	yarn shadow-cljs run re-frisk-remote.core/start
 
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
-run-android: ##@run Run Android build
+run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
-run-desktop: export TARGET ?= $(HOST_OS)
-run-desktop: _run-desktop ##@run Run Desktop build
-
 SIMULATOR=
 run-ios: export TARGET := ios
-run-ios: ##@run Run iOS build
+run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
 	npx react-native run-ios --simulator="$(SIMULATOR)"
 else
@@ -289,21 +231,24 @@ endif
 # Tests
 #--------------
 
-lint: export TARGET := lein
+lint: export TARGET := clojure
 lint: ##@test Run code style checks
-	lein cljfmt check
+	yarn clj-kondo --confg .clj-kondo/config.edn --lint src && \
+	clojure -Sdeps '{:deps {cljfmt {:mvn/version "0.6.7"}}}' \
+		-m cljfmt.main check $$(git diff --diff-filter=d --cached --name-only src && echo src) \
+		--indents indentation.edn
 
-lint-fix: export TARGET := lein
+lint-fix: export TARGET := clojure
 lint-fix: ##@test Run code style checks and fix issues
-	lein cljfmt fix
+	clojure -Sdeps '{:deps {cljfmt {:mvn/version "0.6.7"}}}' \
+		-m cljfmt.main fix src \
+		--indents indentation.edn
 
-test: export TARGET := lein
+test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	lein with-profile test doo node test once
-
-test-auto: export TARGET := lein
-test-auto: ##@test Run tests in interactive (auto) mode in NodeJS
-	lein with-profile test doo node test
+	yarn shadow-cljs compile mocks && \
+	yarn shadow-cljs compile test && \
+	node --require ./test-resources/override.js target/test/test.js
 
 coverage: ##@test Run tests once in NodeJS generating coverage
 	@scripts/run-coverage.sh
@@ -311,29 +256,16 @@ coverage: ##@test Run tests once in NodeJS generating coverage
 #--------------
 # 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
-
-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
 
+android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
-	git clean -dxf -f ./android/app/build
-	[ -d android/.gradle ] && cd android && ./gradlew clean
+	git clean -dxf -f ./android/app/build; \
+	[[ -d android/.gradle ]] && cd android && ./gradlew clean
 
 android-ports: export TARGET := android-env
 android-ports: ##@other Add proxies to Android Device/Simulator
@@ -352,38 +284,19 @@ android-logcat: ##@other Read status-react logs from Android phone using adb
 
 android-install: export TARGET := android-env
 android-install: export BUILD_TYPE ?= release
-android-install:
+android-install: ##@other Install APK on device using adb
 	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 '^$@$$'
 
-_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
 
-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
+repl-nix: nix-repl ##@repl Start an interactive Nix REPL

README.md

@@ -21,7 +21,7 @@ Go straight to the [docs](https://status.im/docs) or [join our chat](https://joi
 
 - **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.
+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/technical/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 long lasting relationships you form will be well worth it, check out our [Community Principles](https://status.im/contribute/our_principles.html)
@@ -33,7 +33,7 @@ John Dewey once said "Education is not preparation for life; education is life *
 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 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!
+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](https://status.im/technical/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**  
 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!
@@ -46,7 +46,7 @@ View our [API Docs](https://status.im/developer_tools/status_web_api.html) and l
 
 ## Give me Binaries!
 
-You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/build_status/).
+You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/technical/build_status/).
 
 ## Core Contributors
 

RELEASE.md

@@ -0,0 +1,11 @@
+# Description
+
+This document explains some of the steps that are involved in relseases.
+
+## PlayStore Metadata Updates
+
+You can update Play Store releae metadata using `fastlane android upload_metadata`.
+
+But that requires credentials necessary for accessing Play Store API. The simpler way is to edit files contained within [`fastlane/metadata`](metadata) and run the following CI job:
+
+https://ci.status.im/job/status-tools/job/update-playstore-metadata/

STARTING_GUIDE.md

@@ -17,6 +17,17 @@ make release-ios
 ```
 For more `make` targets run `make help`.
 
+# Development
+
+There are three steps necessary to start development, in this case for Android:
+
+1. `make run-clojure` - Compiles Clojure into JavaScript, watches for changes on cljs files, and hot-reloads code in the app
+2. `make run-metro` - Starts metro bundler and watches JavaScript code
+3. `make run-android` - Builds the Android app and starts it on the device
+
+The first two will continue watching for changes and keep re-building the app. They need to be ready first.
+The last one will exit once the app is up and ready.
+
 # Manual Steps
 
 There are a few manual steps you might want to do in order to start contributing.

TROUBLESHOOTING.md

@@ -51,7 +51,7 @@ Developer updates `package.json` file with a new dependency using a GitHub URL.
 ```
   "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:
+Afterwards, when running e.g. `make run-metro`, 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
@@ -67,8 +67,6 @@ info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this
 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`.

VERSION

@@ -1 +1 @@
-0.14.0
+1.7.2

android/app/BUCK

@@ -1,53 +0,0 @@
-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',
-  ],
-)

android/app/build.gradle

@@ -21,7 +21,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   bundleAssetName: "index.android.bundle",
  *
  *   // the entry file for bundle generation
- *   entryFile: "index.android.js",
+ *   entryFile: "index.js",
  *
  *   // whether to bundle JS and assets in debug mode
  *   bundleInDebug: false,
@@ -70,7 +70,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"],
+ *   nodeExecutableAndArgs: ["node", "--max-old-space-size=8192"],
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []
@@ -78,8 +78,13 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  */
 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
+    entryFile: "index.js",
+    /* 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.
+     * Also a clean and rebuild is required when changing this. */
+    enableHermes: true,
+    /* Disable 'The first definition was here.' warnings */
+    hermesFlagsRelease: ["-w"],
     bundleInPr: true,
     inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
@@ -199,6 +204,12 @@ 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)
@@ -217,6 +228,8 @@ android {
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
+        /* Caution! In production, you need to generate your own keystore file.
+         * See: https://facebook.github.io/react-native/docs/signed-apk-android */
         release {
             /* environment variables take precedence over gradle.properties file */
             storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
@@ -242,11 +255,11 @@ android {
             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
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig signingConfigs.release
+            if (getEnvOrConfig('ANDROID_APK_SIGNED').toBoolean()) {
+                signingConfig signingConfigs.release
+            }
         }
         pr {
             initWith release
@@ -287,6 +300,19 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.fbjni'
+    }
+    // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+    // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+    //      exclude group:'com.facebook.flipper'
+    // }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
     if (enableHermes) {
       def hermesPath = "../../node_modules/hermes-engine/android/";
       debugImplementation files(hermesPath + "hermes-debug.aar")
@@ -307,29 +333,40 @@ dependencies {
     // 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.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 getLocalNDKDir = { ->
     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')
+    if (!localProperties.exists()) {
+        return null
     }
-    executable "$ndkDir/ndk-build"
+    Properties properties = new Properties()
+    localProperties.withInputStream { instr ->
+        properties.load(instr)
+    }
+    return properties.getProperty('ndk.dir')
+}
+
+// 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!")
+    }
+    executable execPath
 }
 
 preBuild.dependsOn hemroidBuild

android/app/proguard-rules.pro

@@ -15,6 +15,9 @@
 
 # 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

android/app/src/debug/java/im/status/ethereum/ReactNativeFlipper.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package im.status.ethereum;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+// import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+// import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+      // NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      // NetworkingModule.setCustomClientBuilder(
+      //     new NetworkingModule.CustomClientBuilder() {
+      //       @Override
+      //       public void apply(OkHttpClient.Builder builder) {
+      //         builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+      //       }
+      //     });
+      // client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

android/app/src/main/AndroidManifest.xml

@@ -21,6 +21,8 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <!-- these permissions should be removed -->
@@ -35,13 +37,14 @@
             android:theme="@style/AppTheme"
             android:name=".MainApplication"
             android:largeHeap="true"
-            android:usesCleartextTraffic="true">
+            android:usesCleartextTraffic="true"
+            android:requestLegacyExternalStorage="true">
         <activity
                 android:name=".MainActivity"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
                 android:resizeableActivity="false"
                 android:launchMode="singleTask">
             <intent-filter>

android/app/src/main/java/im/status/ethereum/MainActivity.java

@@ -108,6 +108,17 @@ public class MainActivity extends ReactFragmentActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
+        switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+            case Configuration.UI_MODE_NIGHT_YES:
+                setTheme(R.style.DarkTheme);
+
+                break;
+            case Configuration.UI_MODE_NIGHT_NO:
+                setTheme(R.style.LightTheme);
+                break;
+            default:
+                setTheme(R.style.LightTheme);
+        }
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
 
@@ -188,7 +199,7 @@ public class MainActivity extends ReactFragmentActivity
     private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
 
     private boolean shouldShowRootedNotification() {
-        if (RootUtil.isDeviceRooted()) {
+        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
             if (userRejectedRootedNotification()) {
                 return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
             } else return true;
@@ -230,10 +241,6 @@ public class MainActivity extends ReactFragmentActivity
         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

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

@@ -2,16 +2,17 @@ package im.status.ethereum;
 
 import androidx.multidex.MultiDexApplication;
 import android.util.Log;
+import android.content.Context;
+import android.webkit.WebView;
+import java.lang.reflect.InvocationTargetException;
 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 com.facebook.react.ReactInstanceManager;
 
 import java.util.List;
 
@@ -33,13 +34,12 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
             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";
+            return "index";
         }
     };
 
@@ -52,5 +52,37 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
     public void onCreate() {
         super.onCreate();
         SoLoader.init(this, /* native exopackage */ false);
+        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    }
+    /**
+     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+     * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+     *
+     * @param context
+     * @param reactInstanceManager
+     */
+    private static void initializeFlipper(
+          Context context, ReactInstanceManager reactInstanceManager) {
+        if (BuildConfig.DEBUG) {
+            try {
+                /*
+                  We use reflection here to pick up the class that initializes Flipper,
+                  since Flipper library is not available in release mode
+                */
+                Class<?> aClass = Class.forName("im.status.ethereum.ReactNativeFlipper");
+                aClass
+                    .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+                    .invoke(null, context, reactInstanceManager);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
     }
 }