Changed tests run

ci: fix nix sandbox filename by adding random string
By using just the timestamp we increase the probability of hitting a race condition with another build due to same filename of sandbox file. Depends on: https://github.com/status-im/status-jenkins-lib/pull/40 Signed-off-by: Jakub Sokołowski <jakub@status.im>
2022-05-01 05:06:31 +03:00 · 2022-04-27 15:07:26 +04:00 · 2022-04-27 11:57:19 +04:00 · 2022-04-26 12:59:47 +01:00 · 2022-04-25 16:36:03 +03:00 · 2022-04-25 11:18:18 +02:00
726 changed files with 29598 additions and 16889 deletions
@@ -1,6 +1,5 @@
 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
@@ -29,4 +29,8 @@ APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
-EIP1559_ENABLED=1
+DELETE_MESSAGE_ENABLED=1
+COLLECTIBLES_ENABLED=1
+COMMANDS_ENABLED=1
+TWO_MINUTES_SYNCING=1
+SWAP_ENABLED=1
@@ -26,8 +26,11 @@ ENABLE_REFERRAL_INVITE=1
 MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=3
+VERIFY_ENS_CHAIN_ID=3
+TEST_STATEOFUS=1
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
-EIP1559_ENABLED=1
+DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1
@@ -1,6 +1,6 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=mainnet_rpc
+DEFAULT_NETWORK=testnet_rpc
 ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
@@ -18,11 +18,15 @@ RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
 STATUS_GO_ENABLE_NIMBUS=0
+COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=0
 ENABLE_ROOT_ALERT=1
 ENABLE_REFERRAL_INVITE=1
 DISABLE_WALLET_ON_MOBILE_NETWORK=1
 APN_TOPIC=im.status.ethereum.pr
+VERIFY_TRANSACTION_CHAIN_ID=3
+VERIFY_ENS_CHAIN_ID=3
+TEST_STATEOFUS=1
 BLANK_PREVIEW=0
 MAX_IMAGES_BATCH=5
 GOOGLE_FREE=0
@@ -30,4 +34,6 @@ DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
-EIP1559_ENABLED=1
+DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1
+ENABLE_QUO_PREVIEW=1
@@ -23,4 +23,4 @@ BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
-EIP1559_ENABLED=1
+DELETE_MESSAGE_ENABLED=1
@@ -19,5 +19,5 @@ ENABLE_ROOT_ALERT=1
 MAX_IMAGES_BATCH=1
 ENABLE_REFERRAL_INVITE=0
 METRICS_ENABLED=0
-EIP1559_ENABLED=1
-DELETE_MESSAGE_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
+COLLECTIBLES_ENABLED=1
@@ -27,11 +27,11 @@ Upgrade (e2e):
 ### 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 ([example]( https://notes.status.im/1.14-release-notes?view))
+- [ ] 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-react/blob/develop/RELEASES.md) with release notes (make PR based on previous step)
- [ ] 4. Create 1.14.0 release branch and get successful builds (doc is [here](https://github.com/status-im/status-react/blob/develop/doc/RELEASE_GUIDE.md) so, testing can be started)
+- [ ] 4. Create release branch using this [guide](https://github.com/status-im/status-react/blob/develop/doc/RELEASE_GUIDE.md), bump VERSION (merge created PR ([example](https://github.com/status-im/status-react/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. If should be updated, ask @cammellos  for help
+- [ ] 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)
@@ -53,14 +53,15 @@ Upgrade (e2e):

 #### 3) Submission

- [ ] 1. Release notes written and added (500 character limit for updates (Android) and PR for [RELEASES.md](https://github.com/status-im/status-react/blob/develop/RELEASES.md) is ready to be merged (from 1.3 step)
- [ ] 2. Submit beta version for Android (Open Testing in Play Store)
- [ ] 3. Submit iOS build to Apple review ([instruction](https://drive.google.com/file/d/10Cl7PBB7TFPkZiVbfzdFGpfMRP9bxXuq/view?usp=sharing), be careful - low quality of audio)
- [ ] 4. Play store content reviewed and updated
- [ ] 5. Privacy policy reviewed and updated (ask in channel)
- [ ] 6. Countries to be excluded (ask in channel) 
- [ ] 7. Changes to our FAQ made (should be checked and if any changes needed, ask Jakub to made them)
- [ ] 8. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-react/blob/develop/doc/FDROID.md))
+- [ ] 1. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-react/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-react/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)
@@ -68,7 +69,7 @@ Upgrade (e2e):
 - [ ] 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)
+- [ ] 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-react/releases (Jakub)
@@ -10,7 +10,7 @@ project-board:

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

 github-team:
@@ -168,4 +168,5 @@ project.clj

 ##appium
 test/appium/report/
-result.xml
+result.xml
+test/appium/tests/users.py
@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro 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 _install-hooks

 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -42,7 +42,7 @@ 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_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE

 # Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
@@ -57,13 +57,10 @@ endif
 # Nix targets
 #----------------

-# WARNING: This has to be located right before the targets
-ifdef IN_NIX_SHELL
-SHELL := env bash
-else
+# WARNING: This has to be located right before all the targets.
 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
@@ -127,6 +124,11 @@ _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 ##@prepare Remove all output folders
@@ -171,6 +173,13 @@ fdroid-fix-tmp: ##@prepare Fix TMPDIR permissions so Vagrant user is the owner

 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
+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
@@ -196,8 +205,9 @@ release-fdroid: export BUILD_TYPE = release
 release-fdroid: export ANDROID_APK_SIGNED = false
 release-fdroid: export ANDROID_ABI_SPLIT = false
 release-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
+release-fdroid: export READER_FEATURES = google-free
 release-fdroid: ##@build Build release for F-Droid
-	echo "GOOGLE_FREE=1" >> .env.release
+	scripts/google-free.sh
 	scripts/release-android.sh

 release-ios: export TARGET := ios
@@ -1,3 +1,167 @@
+## 1.19 Release notes
+
+### Features
+
+* 💬 Re-open app on the last open chat ([details](https://github.com/status-im/status-react/issues/12782))
+* 🪙 Support \$UBI token ([details](https://github.com/status-im/status-react/issues/12975))
+* 🔔 Implementation of remote android notifications ([details](https://github.com/status-im/status-react/issues/12866))
+* 🔁 Sync clear history on paired devices ([details](https://github.com/status-im/status-react/issues/13004))
+* 📑 Synchronize browser bookmarks/favorites across devices ([details](https://github.com/status-im/status-react/issues/12961))
+* 🔕 Add mute option to android ([details](https://github.com/status-im/status-react/issues/12890))
+* 👛 Wallet Connect 2.0 integration ([details](https://github.com/status-im/status-react/issues/12546))
+* 💰 Implement Wallet Connect 1.0 ([details](https://github.com/status-im/status-react/issues/12870))
+* ⚙️ Sync settings ([details](https://github.com/status-im/status-react/pull/13053))
+
+### Improvements
+
+* Improve order of mailserver requests ([details](https://github.com/status-im/status-react/issues/12783))
+* Load images from an https server ([details](https://github.com/status-im/status-react/issues/12855))
+* Load audio messages from https server ([details](https://github.com/status-im/status-react/issues/13116))
+* Show message timestamps on tap, remove from bubbles 🕙 ([details](https://github.com/status-im/status-react/pull/12915))
+* support PUK and seed recovery during onboarding ([details](https://github.com/status-im/status-react/pull/12955))
+* update react-native-webview ([details](https://github.com/status-im/status-react/pull/12987))
+* Add group members to mentionable list ([details](https://github.com/status-im/status-react/pull/12994))
+* always use english for fallback text ([details](https://github.com/status-im/status-react/pull/13019))
+* Disable chat input for chats with a blocked user ([details](https://github.com/status-im/status-react/pull/13162))
+* Handle timeouts on mailserver requests ([details](https://github.com/status-im/status-react/issues/13022))
+* Human Readable data display when signing using eth_signTypedData_v3 ([details](https://github.com/status-im/status-react/issues/12535))
+
+### Bug Fixes
+
+* Bug/fix opensea api ([details](https://github.com/status-im/status-react/pull/13021))
+* Show "Fetch more messages" only in public chats and communities ([details](https://github.com/status-im/status-react/pull/12927))
+* Chats are not synced if delete and re-add them on the first device while the second device is offline ([details](https://github.com/status-im/status-react/issues/12913))
+* fix distortion of app theme due to change in system theme ([details](https://github.com/status-im/status-react/pull/12934))
+* Unable to perform swap on 1inch.exchange if initial swap was cancelled by closing bottom sheet ([details](https://github.com/status-im/status-react/issues/12920))
+* Error when trying to edit 'per-gas price limit' on 1inch.exchange ([details](https://github.com/status-im/status-react/issues/12991))
+* Allow adding emoji in status input even if it exceeds limit ([details](https://github.com/status-im/status-react/pull/12949))
+* Allow adding emoji to group intro message if it exceeds limit ([details](https://github.com/status-im/status-react/pull/13024))
+* Use higher base fee value for default tx fee calculation ([details](https://github.com/status-im/status-react/pull/13020))
+* Profile QR code overlaps share menu during sharing (IOS) ([details](https://github.com/status-im/status-react/pull/13050))
+* No value in 'Gas amount limit' field in NFT dapps ([details](https://github.com/status-im/status-react/pull/13051))
+* Stop showing fetch more button for cleared history ([details](https://github.com/status-im/status-react/pull/13084))
+* fix ens resolve issue while following deep link ([details](https://github.com/status-im/status-react/pull/13080))
+* Fix deadlock on syncing all data ([details](https://github.com/status-im/status-react/pull/13128))
+* Fix broken username and timestamp layout for long usernames ([details](https://github.com/status-im/status-react/pull/13174))
+
+## 1.18.0 Release notes :package:
+
+### Features
+* 🚦Online status indicator <https://github.com/status-im/status-react/issues/12547>
+* 👛 Add possibility to select wallet for ENS names <https://github.com/status-im/status-react/pull/12761>
+* 🐞 Bug reporting and logs sharing improvements <https://github.com/status-im/status-react/pull/12773>
+* 🍳 Simplify Keycard onboarding by using defaults for pairing password <https://github.com/status-im/status-react/issues/12685>
+* 💾 Backup contacts via Waku <https://github.com/status-im/status-react/issues/12550>
+* 🪙 Added ENS token <https://github.com/status-im/status-react/issues/12807>
+* 🌠 Using react-native-fast-image for stickers <https://github.com/status-im/status-react/pull/12769>
+#### Message reliability improvements
+* 𝌗 Show loading until all messages are processed <https://github.com/status-im/status-react/pull/12834>
+* 💪🏼 More robust message confirmations handling <https://github.com/status-im/status-react/pull/12824>
+* 📶 Allow sending messages when offline <https://github.com/status-im/status-react/issues/11889>
+#### Improvements on device pairing 
+* 🔔💻 Notification in activity centre now sync across devices <https://github.com/status-im/status-react/issues/12571>
+* ✅💻 Sync read messages across devices <https://github.com/status-im/status-react/pull/12698>
+#### Network settings improvements
+* ✨ Add Binance Smart chain <https://github.com/status-im/status-react/pull/12809>
+* ♏︎ Added custom network symbol <https://github.com/status-im/status-react/commit/c16b0860ec921a61c119857de27c6f29e301e4f6>
+* 💰 Network fee on xDai chain <https://github.com/status-im/status-react/pull/12845>
+* 📇 Support tx history (in a way) when on BSC chains <https://github.com/status-im/status-react/pull/12843>
+* 🙅🏻 Remove POA network from the list <https://github.com/status-im/status-react/pull/12887>
+
+### Bug Fixes
+* Fix activity center community invite preview <https://github.com/status-im/status-react/pull/12803>
+* Missing notifications for some contacts <https://github.com/status-im/status-react/issues/12776>
+* Fixes scrolling issues on the 'Max priority fee' bottom sheet <https://github.com/status-im/status-react/issues/12530>
+* Handle Keycard timeout on iOS 15 <https://github.com/status-im/status-react/pull/12826>
+* Allow user to be reinvited to the same group after leaving <https://github.com/status-im/status-react/pull/12814>
+* Fix for "TypeError: Network request failed" when switching to Goerli network <https://github.com/status-im/status-react/issues/11964>
+* Fix for Spin of death on adding custom NFT token contract <https://github.com/status-im/status-react/issues/12365>
+* Changing screen orientation results in breaking images / layout <https://github.com/status-im/status-react/issues/12858>
+
+
+## 1.17
+
+### For iOS and Android
+
+### Features
+
+- 🖼️ Add ability to Share image from Status ([details](https://github.com/status-im/status-react/pull/12528))
+- 🕵️ Private Profile Photos ([details](https://github.com/status-im/status-react/pull/11768))
+- 🥥 Custom Emoji Thumbnails for Community Channels ([details](https://github.com/status-im/status-react/pull/12594))
+- 🔄 Sync deleted chats ([details](https://github.com/status-im/status-react/pull/12662))
+- 🔃 Sync removed/deleted/blocked contacts ([details](https://github.com/status-im/status-react/pull/12541))
+- 💸 Allow overriding nonce when sending transaction ([details](https://github.com/status-im/status-react/pull/12679))
+- 🗑️ Delete messages ([details](https://github.com/status-im/status-react/pull/12390))
+- 🎨 NFT Support via OpenSea ([details](https://github.com/status-im/status-react/pull/12485))
+- 🤳🏻 Enable collectibles and NFT as profile picture ([details](https://github.com/status-im/status-react/pull/12615))
+
+### Improvements
+
+- Move pull to refresh to the account overview screen ([details](https://github.com/status-im/status-react/pull/12479))
+- Add $RARE token to our default list ([details](https://github.com/status-im/status-react/pull/12521))
+- Small UI Design Improvements ([details](https://github.com/status-im/status-react/pull/12544))
+- Chats list performance ([details](https://github.com/status-im/status-react/pull/12554))
+- Add push notification on group chat invite ([details](https://github.com/status-im/status-react/pull/12440))
+- Contacts performance ([details](https://github.com/status-im/status-react/pull/12643))
+- Add profile image in push notifications ([details](https://github.com/status-im/status-react/pull/12427))
+- Enable UI for signing legacy txs on networks without eip1559 ([details](https://github.com/status-im/status-react/pull/12692))
+- Doubled the character limit on timeline posts ([details](https://github.com/status-im/status-react/commit/a9333ad52ca71f512d5306f802927d0c20d63944))
+
+### Bugfixes
+
+- Don't show notifications from self ([details](https://github.com/status-im/status-react/pull/12505))
+- Request permissions before saving images ([details](https://github.com/status-im/status-react/pull/12516))
+- Re-enable amount/fee validation on tx signing ([details](https://github.com/status-im/status-react/pull/12537))
+- Fix browser history sorting ([details](https://github.com/status-im/status-react/pull/12497))
+- Fix show/hide password on Android ([details](https://github.com/status-im/status-react/pull/12536))
+- Fix connecting autofarm.network dapps with status wallet freezes ([details](https://github.com/status-im/status-react/pull/12529))
+- RPC URL is lower-cased when entered in URL field when adding ([details](https://github.com/status-im/status-react/pull/12574))
+- Allow retrieving of profile updates after removing contact ([details](https://github.com/status-im/status-react/pull/12581))
+- Fetch history on receiving pubchat installation ([details](https://github.com/status-im/status-react/pull/12644))
+- Can't send funds to multisig - Out of gas ([details](https://github.com/status-im/status-react/pull/12648))
+- Fix handling errors on eth_gasPrice ([details](https://github.com/status-im/status-react/pull/12710))
+
+## 1.16
+
+### For iOS and Android
+
+### Features
+
+- EIP-1159 support ([#12369](https://github.com/status-im/status-react/pull/12369))
+- Hide/show option for accounts in the wallet ([#12438](https://github.com/status-im/status-react/pull/12438))
+- Delete accounts in wallet ([#12444](https://github.com/status-im/status-react/pull/12444))
+- Enable keeping database when migrating account to keycard ([#12306](https://github.com/status-im/status-react/pull/12306))
+- Replies from group chat in activity centre ([#12266](https://github.com/status-im/status-react/pull/12266))
+
+### Improvements
+
+- Remove clear history from non-public chats ([#12384](https://github.com/status-im/status-react/pull/12384))
+- Clearing push notifications on read (Android) ([#12464](https://github.com/status-im/status-react/pull/12464))
+- Enable migration to keycard from signed-in state ([#11778](https://github.com/status-im/status-react/issues/11778))
+
+### Bug Fixes
+
+#### Chat
+
+- Fix Error when opening 1-1 chat in Activity center for blocked user ([#12399](https://github.com/status-im/status-react/pull/12399))
+- Long press is long and it makes the message disappear entirely ([#12445](https://github.com/status-im/status-react/pull/12445))
+- Sort pinned messages by time of pinning ([#12402](https://github.com/status-im/status-react/pull/12402))
+- Screens with overlapping long usernames ([#12471](https://github.com/status-im/status-react/pull/12471))
+
+#### Browser (Dapp)
+
+- Fix some token swap errors in Uniswap ([#12417](https://github.com/status-im/status-react/pull/12417))
+- Update react-native-webview for better SSL handling ([#12409](https://github.com/status-im/status-react/pull/12409))
+
+#### Keycard
+
+- App freezes until reopening when signing tx with frozen Keycard ([#12473](https://github.com/status-im/status-react/pull/12473))
+
+#### Wallet
+
+- Allow to add assets with same name ([#12466](https://github.com/status-im/status-react/pull/12466))
+- Update DATAcoin name ([#12454](https://github.com/status-im/status-react/pull/12454))
+
 ## 1.15

 ### For iOS and Android
@@ -1 +1 @@
-1.16.0
+1.19.0
@@ -126,7 +126,14 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 /**
 * Exclude google library so we can publish to external android stores
 */
-def googleFree = project.env.get("GOOGLE_FREE", false)
+def googleFree = project.env.get("GOOGLE_FREE", 0) == '1'
+
+def getCommitHash = { ->
+    if (project.hasProperty("commitHash")) {
+        return project.commitHash
+    }
+    return "unknown"
+}

 def getVersionCode = { ->
    new ByteArrayOutputStream().withStream { stdOut ->
@@ -184,6 +191,7 @@ 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 {
@@ -333,6 +341,8 @@ dependencies {
            exclude group: 'com.google.android.gms'
            exclude group: 'com.android.installreferrer'
        }
+    } else {
+	implementation 'com.google.firebase:firebase-messaging:23.0.0'
    }

    // react-native-screens
@@ -348,8 +358,9 @@ dependencies {
    implementation project(':react-native-status')
    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'
+    implementation 'com.facebook.fresco:fresco:2.2.0'
+    implementation 'com.facebook.fresco:animated-gif:2.2.0'
+    implementation "com.squareup.okhttp3:okhttp-tls:3.12.12"
 }

 def getLocalNDKDir = { ->
@@ -371,7 +382,7 @@ task hemroidBuild(type: Exec) {
    def localNdkDir = getLocalNDKDir()
    def ndkDir = System.env.ANDROID_NDK_ROOT
    if (localNdkDir != null) {
-        ndkDir = localNdkDir 
+        ndkDir = localNdkDir
    }

    def execPath = "$ndkDir/ndk-build"
@@ -385,3 +396,7 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild

 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+if (!googleFree) {
+	apply plugin: "com.google.gms.google-services"
+}
@@ -0,0 +1,119 @@
+{
+  "project_info": {
+    "project_number": "854811651919",
+    "firebase_url": "https://status-react-app.firebaseio.com",
+    "project_id": "status-react-app",
+    "storage_bucket": "status-react-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:11ee7444ded8a00a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:15dbe4af1e06ca3e005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:1d0d69fe8c1bb89b005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.pr"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
@@ -64,3 +64,15 @@
 -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 *;
+}
@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
+    <uses-permission tools:node="remove" 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" />
 </manifest>
@@ -17,14 +17,13 @@
    <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.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+                     android:maxSdkVersion="28" />
    <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" />
-
    <application
            tools:replace="android:allowBackup"
            android:allowBackup="false"
@@ -33,8 +32,8 @@
            android:theme="@style/AppTheme"
            android:name=".MainApplication"
            android:largeHeap="true"
-            android:usesCleartextTraffic="true"
-            android:requestLegacyExternalStorage="true">
+            android:usesCleartextTraffic="true">
+        <meta-data android:name="commitHash" android:value="${commitHash}"/>
        <activity
                android:name=".MainActivity"
                android:label="@string/app_name"
@@ -82,6 +81,12 @@
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_provider_paths" />
        </provider>
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon" />
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/notification_icon_color" />
    </application>

 </manifest>
@@ -9,17 +9,20 @@ import com.facebook.react.PackageList;

 import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
 import com.facebook.react.ReactApplication;
+import cl.json.RNSharePackage;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.network.OkHttpClientProvider;

 import java.util.List;

 import im.status.ethereum.keycard.RNStatusKeycardPackage;
 import im.status.ethereum.module.StatusPackage;
 import im.status.ethereum.pushnotifications.PushNotificationPackage;
+import im.status.ethereum.StatusOkHttpClientFactory;

 public class MainApplication extends NavigationApplication {

@@ -55,7 +58,9 @@ public class MainApplication extends NavigationApplication {
    @Override
    public void onCreate() {
        super.onCreate();
-        
+
+        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
+
        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    }
@@ -0,0 +1,44 @@
+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.Interceptor;
+import okhttp3.tls.HandshakeCertificates;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+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 implements OkHttpClientFactory {
+  public OkHttpClient createNewNetworkModuleClient() {
+    String certPem = StatusPackage.getImageTLSCert();
+    X509Certificate cert;
+
+    try {
+      CertificateFactory cf = CertificateFactory.getInstance("X.509");
+      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
+    } catch(Exception e) {
+      Log.e("StatusOkHttpClientFactory", "Could not parse certificate");
+      cert = null;
+    }
+
+    HandshakeCertificates clientCertificates = new HandshakeCertificates.Builder()
+      .addPlatformTrustedCertificates()
+      .addTrustedCertificate(cert)
+      .build();
+
+    return OkHttpClientProvider.createClientBuilder()
+      .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
+      .build();
+  }
+}
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="alert_background">#141414</color>
+  <color name="alert_text">#ffffff</color>
+</resources>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="alert_background">#ffffff</color>
+  <color name="alert_text">#000000</color>
+  <color name="notification_icon_color">#4360DF</color>
+</resources>
@@ -8,6 +8,7 @@
        <item name="android:forceDarkAllowed">true</item>
        <item name="android:windowTranslucentStatus">false</item>
        <item name="android:statusBarColor">?attr/backgroundColor</item>
+	<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
    </style>

    <style name="LightTheme" parent="AppTheme">
@@ -21,4 +22,10 @@
        <item name="backgroundColor">#000000</item>
        <item name="android:windowLightStatusBar">false</item>
    </style>
+
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+      <item name="android:textColor">@color/alert_text</item>
+      <item name="android:textColorPrimary">@color/alert_text</item>
+      <item name="android:background">@color/alert_background</item>
+    </style>
 </resources>
@@ -3,5 +3,7 @@

    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
    <uses-permission tools:node="remove" 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"/>

 </manifest>
@@ -3,5 +3,7 @@

    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
    <uses-permission tools:node="remove" 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"/>

-</manifest>
+</manifest>
@@ -22,6 +22,7 @@ buildscript {
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
        classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
+	classpath "com.google.gms:google-services:4.3.10"
        // WARNING: Do not place your application dependencies here!
        //          They belong in the individual module build.gradle files.
    }
@@ -23,12 +23,12 @@
 # Version requirements used throughout the Gradle scripts
 kotlinVersion=1.3.50
 minSdkVersion=23
-compileSdkVersion=29
-targetSdkVersion=29
-buildToolsVersion=30.0.3
+compileSdkVersion=30
+targetSdkVersion=30
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=3.5.3
+gradlePluginVersion=3.5.4

 android.useAndroidX=true
 android.enableJetifier=true
@@ -48,6 +48,7 @@ ANDROID_APK_SIGNED=true
 org.gradle.jvmargs=-Xmx8704M

 versionCode=9999
+commitHash=unknown

 # Flipper
 FLIPPER_VERSION=0.54.0
@@ -1,4 +1,6 @@
 pluginManagement {
+include ':react-native-share'
+project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
  repositories {
      mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
      gradlePluginPortal()
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.4.1'

 pipeline {
-  agent { label 'linux' }
+  agent { label 'linux && x86_64 && nix-2.6' }

  options {
    timestamps()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.4.1'

 pipeline {
  agent { label 'linux' }
@@ -58,7 +58,7 @@ pipeline {
        //jenkins.copyArts(iose2e)
        jenkins.copyArts(apk)
        jenkins.copyArts(apke2e)
-        sha = "pkg/${utils.pkgFilename('sha256')}"
+        sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
        dir('pkg') {
          /* generate sha256 checksums for upload */
          sh "sha256sum * | tee ../${sha}"
@@ -101,7 +101,7 @@ pipeline {
      steps { script {
        e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
        build(
-          job: 'end-to-end-tests/status-app-nightly',
+          job: 'status-react/e2e/status-app-nightly',
          parameters: [string(name: 'APK_NAME', value: e2eApk)],
          wait: false
        )
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.4.1'

 pipeline {
-  agent { label 'macos-xcode-12.5' }
+  agent { label 'macos && x86_64 && nix-2.6 && xcode-12.5' }

  parameters {
    string(
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.4.1'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -3,15 +3,15 @@ pipeline {
  agent { label 'linux' }

  parameters {
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
-    )
    string(
      name: 'APK_NAME',
      description: 'Filename of APK uploaded to SauceLabs.',
    )
+    string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
  }

  options {
@@ -48,16 +48,22 @@ pipeline {
            credentialsId: 'infura-e2e-token',
            variable: 'WEB3_INFURA_PROJECT_ID'
          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
        ]) {
          dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
                --numprocesses 15 \
                --rerun_count=2 \
                --testrail_report=True \
                -m testrail_id \
-                -m "not upgrade" \
-                --network=${params.NETWORK} \
+                -m \"not upgrade\" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                --apk=${params.APK_NAME}
            """
          }
@@ -1,3 +1,5 @@
+library 'status-jenkins-lib@v1.4.1'
+
 pipeline {

  agent { label 'linux' }
@@ -8,16 +10,12 @@ pipeline {
      description: 'Name of the branch to checkout and build.',
      defaultValue: 'develop',
    )
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
-    )
+/* Commented to use TEST_MARKERS values from job params
    string(
      name: 'TEST_MARKERS',
      description: 'Marker expression for matching tests to run.',
-      defaultValue: 'critical or high',
-    )
+      defaultValue: 'critical',
+    ) */
    string(
      name: 'APK_NAME',
      description: 'Filename of APK uploaded to SauceLabs, path, or URL.',
@@ -26,9 +24,14 @@ pipeline {
      name: 'PR_ID',
      description: 'ID of the Pull Request triggering this build.',
    )
+    string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
    string(
      name: 'TR_CASE_IDS',
-      description: 'IDs of the TestRail case, separated by a comma. (Optional)',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
      defaultValue: '',
    )
  }
@@ -84,17 +87,23 @@ pipeline {
            credentialsId: 'infura-e2e-token',
            variable: 'WEB3_INFURA_PROJECT_ID'
          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
        ]) {
          dir('test/appium/tests') {
+            /* Provide Eth test account secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                --numprocesses 15 \
+                --numprocesses 9 \
                --rerun_count=2 \
                --testrail_report=True \
-                -m "${params.TEST_MARKERS}" \
-                --network=${params.NETWORK} \
+                -m \"${params.TEST_MARKERS}\" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                --apk=${params.APK_NAME} \
-                --build=PR-${params.PR_ID} \
+                --build=PR-${params.PR_ID}-${utils.timestamp()} \
                --pr_number=${params.PR_ID} \
                ${extraPytestOpts}
            """
@@ -3,11 +3,6 @@ pipeline {
  agent { label 'linux' }

  parameters {
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use',
-      defaultValue: 'ropsten',
-    )
    string(
      name: 'APK_NAME',
      description: 'Filename of APK uploaded to SauceLabs (base for upgrade, usually release build)',
@@ -16,6 +11,16 @@ pipeline {
      name: 'APK_NAME_UPGRADE',
      description: 'Filename of APK of upgraded application (installed on top of base)',
    )
+     string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
+     string(
+      name: 'TR_CASE_IDS',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
+      defaultValue: '',
+    )
  }

  options {
@@ -32,7 +37,12 @@ pipeline {
      } }
    }
    stage('Test') {
-      steps {
+      steps { script {
+       /* for managing optional arguments */
+        def extraPytestOpts = ''
+        if (params.TR_CASE_IDS != '') {
+          extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
+        }
        withCredentials([
          usernamePassword(
            credentialsId:  'test-rail-api',
@@ -52,22 +62,29 @@ pipeline {
            credentialsId: 'infura-e2e-token',
            variable: 'WEB3_INFURA_PROJECT_ID'
          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
        ]) {
          dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                -m upgrade \
+                -m "upgrade" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                --numprocesses 15 \
                --rerun_count=2 \
                --testrail_report=True \
-                --network=${params.NETWORK} \
                --apk=${params.APK_NAME} \
-                --apk_upgrade=${params.APK_NAME_UPGRADE}
+                --apk_upgrade=${params.APK_NAME_UPGRADE} \
+                 ${extraPytestOpts}
            """
          }
        }
      }
-    }
+    } }
  }

  post {
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.4.1'

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

 pipeline {
  agent { label 'linux' }
@@ -29,7 +29,7 @@ pipeline {
      name: 'HOST_LABEL',
      description: 'Label of host to run on',
      /* Using startTimeInMillis to randomize which host gets the update. */
-      defaultValue: "macos-0${(currentBuild.startTimeInMillis % 3) + 1}",
+      defaultValue: "maci7-0${(currentBuild.startTimeInMillis % 3) + 1}",
    )
  }

@@ -160,3 +160,11 @@ fixed because even bugfix version upgrade causes runtime errors with current ver
 ## "web3-utils": "^1.2.1"

 used for some abi encoding primitives
+
+## "rn-emoji-keyboard": "https://github.com/status-im/rn-emoji-keyboard"
+
+Used for taking emoji input, for custom emoji thumbnails for community channels
+
+## "react-native-draggable-flatlist": "https://github.com/computerjazz/react-native-draggable-flatlist"
+
+A drag-and-drop-enabled FlatList component for React Native
@@ -14,6 +14,38 @@ First release of Status app was merged in [fdroid/fdroiddata#7179](https://gitla

 # Adding New Versions

+There are two ways - automated and manual - described below.
+
+## Automated
+
+The script will analyze a provided APK, update the metadata file based on that information, and commit the change to [`fdroiddata`](https://gitlab.com/fdroid/fdroiddata) repo. The creation of merge request is manual.
+
+#### Requirements:
+
+- GitLab account
+- Forked copy of the [`fdroiddata`](https://gitlab.com/fdroid/fdroiddata) repo
+- Link to the release published
+
+#### Steps
+
+1. Use the F-Droid PR update script via `make`:
+    ```sh
+    make fdroid-pr APK=StatusIm-Mobile-v1.16.0-ef34af.apk
+    ```
+    The script also accepts a URL.
+2. Add a fork repo:
+    ```sh
+    git remote add john https://gitlab.com/john/fdroiddata.git
+    ```
+3. Push:
+    ```sh
+    git push john status-im/v1.16.0
+    ```
+4. [Create a PR via the GitLab interface.](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
+
+
+## Manual
+
 You can find our configuration file at [`metadata/im.status.ethereum.yml`](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/im.status.ethereum.yml)

 The file defines all the necessary metadata like `SourceCode`, `Website`, or `License`, but the most important key is `Builds`, which looks like this:
@@ -42,6 +74,7 @@ It contains a list of objects defining each release of the application. In order
 The `versionCode` should be the same as the one in build that was uploaded to Play Store.
 It can be found in the build logs or by using:
 ```
+ > make shell TARGET=android
 > apkanalyzer manifest version-code StatusIm-Mobile-v1.12.0.apk
 2021022512
 ```
@@ -99,6 +132,8 @@ The original research was done in [#8512](https://github.com/status-im/status-re

 Normally F-Droid server wants to run Gradle itself, but we do not specify the `gradle` key in order to run `make release-fdroid` ourselves in `build` step. We also add `android/build.gradle` to `scanignore` to avoid F-Droid trying to use Gradle directly.

+The Android metadata like description or screenshots is [loaded from our repository](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#fastlane-structure) based on the Fastlane [`supply`](https://docs.fastlane.tools/actions/supply/) tool folder structure for updating Google Play store metadata.
+
 Once the PR is merged it may take a few days for the F-Droid server farm to build and deploy the new version to their site and app. You can look up the current state of builds [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500) and look for your App ID and a `deploy` change after it.

 # F-Droid Build
@@ -10,13 +10,6 @@ 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`.
-
 # Development

 There are three steps necessary to start development, in this case for Android:
@@ -28,6 +21,25 @@ There are three steps necessary to start development, in this case for Android:
 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.

+You need to have your emulator or real devices running and visible to adb, before you run `make run-android`.
+
+# Build release
+
+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`.
+
+# Updating Dependencies
+
+* `make nix-update-pods` - iOS CocoaPods dependencies (updates `ios/Podfile` and `ios/Podfile.loc`)
+* `make nix-update-gradle` - Android Gradle/Maven dependencies (updates `nix/deps/gradle/deps.json`)
+* `make nix-update-clojure` - Clojure Maven dependencies (updates `nix/deps/clojure/deps.json`)
+* `make nix-update-gems` - Fastlane Ruby dependencies (updates `fastlane/Gemfile.lock` and `fastlane/gemset.nix`)
+
 # Manual Steps

 There are a few manual steps you might want to do in order to start contributing.
@@ -1,62 +1,80 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.3)
-    addressable (2.7.0)
+    CFPropertyList (3.0.5)
+      rexml
+    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.442.0)
-    aws-sdk-core (3.113.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.579.0)
+    aws-sdk-core (3.130.2)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.43.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.113.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
    declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.3)
+    digest-crc (0.6.4)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.79.0)
-    faraday (1.3.0)
+    emoji_regex (3.2.3)
+    excon (0.92.2)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
    faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.3)
-    fastlane (2.179.0)
+    fastimage (2.2.6)
+    fastlane (2.205.2)
      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
+      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
      aws-sdk-s3 (~> 1.0)
      babosa (>= 1.0.3, < 2.0.0)
      bundler (>= 1.12.0, < 3.0.0)
      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
      dotenv (>= 2.1.1, < 3.0.0)
      emoji_regex (>= 0.1, < 4.0)
      excon (>= 0.71.0, < 1.0.0)
@@ -65,19 +83,20 @@ GEM
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (~> 2.0.0)
      naturally (~> 2.2)
+      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
      terminal-notifier (>= 2.0.0, < 3.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
@@ -90,75 +109,71 @@ GEM
    fastlane-plugin-diawi (2.1.0)
      rest-client (>= 2.0.0)
    gh_inspector (1.1.3)
-    google-api-client (0.38.0)
+    google-apis-androidpublisher_v3 (0.19.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-core (0.4.2)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-apis-core (0.3.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.14)
-      httpclient (>= 2.8.1, < 3.0)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
+      retriable (>= 2.0, < 4.a)
      rexml
-      signet (~> 0.14)
      webrick
-    google-apis-iamcredentials_v1 (0.3.0)
-      google-apis-core (~> 0.1)
-    google-apis-storage_v1 (0.3.0)
-      google-apis-core (~> 0.1)
+    google-apis-iamcredentials_v1 (0.10.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.7.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-storage_v1 (0.13.0)
+      google-apis-core (>= 0.4, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-storage (1.31.0)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.2.0)
+    google-cloud-storage (1.36.2)
+      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (0.16.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    highline (1.7.10)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
    http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.2)
+    jmespath (1.6.1)
+    json (2.6.1)
+    jwt (2.3.0)
    memoist (0.16.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2022.0105)
    mini_magick (4.11.0)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    netrc (0.11.0)
-    os (1.1.1)
+    optparse (0.1.1)
+    os (1.1.4)
    plist (3.6.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    representable (3.0.4)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    representable (3.1.1)
      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    rest-client (2.1.0)
      http-accept (>= 1.7.0, < 2.0)
@@ -168,21 +183,21 @@ GEM
    retriable (3.1.2)
    rexml (3.2.5)
    rouge (2.0.7)
-    ruby2_keywords (0.0.4)
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    signet (0.16.1)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
      CFPropertyList
      naturally
-    slack-notifier (2.3.2)
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
    tty-screen (0.8.1)
    tty-spinner (0.9.3)
@@ -190,16 +205,17 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.1)
+    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.19.0)
+    xcodeproj (1.21.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
    xcpretty (0.3.0)
      rouge (~> 2.0.7)
    xcpretty-travis-formatter (1.0.1)
@@ -5,10 +5,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+      sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
      type = "gem";
    };
-    version = "2.7.0";
+    version = "2.8.0";
  };
  artifactory = {
    groups = ["default"];
@@ -35,20 +35,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
+      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
      type = "gem";
    };
-    version = "1.1.1";
+    version = "1.2.0";
  };
  aws-partitions = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lm08fmahg3m87vbsfv73iswgvicdwcxfmkzr6v9qshlkg36lafd";
+      sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w";
      type = "gem";
    };
-    version = "1.442.0";
+    version = "1.579.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0";
+      sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
      type = "gem";
    };
-    version = "3.113.1";
+    version = "3.130.2";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
+      sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
      type = "gem";
    };
-    version = "1.43.0";
+    version = "1.56.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
+      sha256 = "0kxcc3abjxld66ryrivfq9wxxpik8ngr2b2dr7shgrsgf5zmrkh8";
      type = "gem";
    };
-    version = "1.93.0";
+    version = "1.113.1";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -89,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
+      sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
      type = "gem";
    };
-    version = "1.2.3";
+    version = "1.5.0";
  };
  babosa = {
    groups = ["default"];
@@ -105,24 +105,25 @@
    version = "1.0.4";
  };
  CFPropertyList = {
+    dependencies = ["rexml"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+      sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
      type = "gem";
    };
-    version = "3.0.3";
+    version = "3.0.5";
  };
  claide = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+      sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
      type = "gem";
    };
-    version = "1.0.3";
+    version = "1.1.0";
  };
  colored = {
    groups = ["default"];
@@ -144,16 +145,16 @@
    };
    version = "3.1.2";
  };
-  commander-fastlane = {
+  commander = {
    dependencies = ["highline"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
+      sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
      type = "gem";
    };
-    version = "4.4.6";
+    version = "4.6.0";
  };
  declarative = {
    groups = ["default"];
@@ -165,26 +166,16 @@
    };
    version = "0.0.20";
  };
-  declarative-option = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
  digest-crc = {
    dependencies = ["rake"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
+      sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
      type = "gem";
    };
-    version = "0.6.3";
+    version = "0.6.4";
  };
  domain_name = {
    dependencies = ["unf"];
@@ -212,31 +203,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15xqimc9dr9yyrf09dy8g60s65bvgg6xyyr7q74352r9vhwyg357";
+      sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c";
      type = "gem";
    };
-    version = "3.2.2";
+    version = "3.2.3";
  };
  excon = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23";
+      sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba";
      type = "gem";
    };
-    version = "0.79.0";
+    version = "0.92.2";
  };
  faraday = {
-    dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
+    dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+      sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.10.0";
  };
  faraday-cookie_jar = {
    dependencies = ["faraday" "http-cookie"];
@@ -249,6 +240,57 @@
    };
    version = "0.0.7";
  };
+  faraday-em_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-em_synchrony = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-excon = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  faraday-httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  faraday-multipart = {
+    dependencies = ["multipart-post"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
  faraday-net_http = {
    groups = ["default"];
    platforms = [];
@@ -259,37 +301,77 @@
    };
    version = "1.0.1";
  };
+  faraday-net_http_persistent = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  faraday-patron = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-rack = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-retry = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
  faraday_middleware = {
    dependencies = ["faraday"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
+      sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
      type = "gem";
    };
-    version = "1.0.0";
+    version = "1.2.0";
  };
  fastimage = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lgr0vs9kg5622qaf2l3f37b238dncs037fisiygvkbq8sg11i68";
+      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
      type = "gem";
    };
-    version = "2.2.3";
+    version = "2.2.6";
  };
  fastlane = {
-    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1wspwgc1q31049a20k2gnzmizdvq4jdmzyd2fnz7r4g68fygj3sj";
+      sha256 = "091l4vl909rv6alydwlzhbk0lfmfphb7n2sjybdfy2azr07b6a0d";
      type = "gem";
    };
-    version = "2.179.0";
+    version = "2.205.2";
  };
  fastlane-plugin-clean_testflight_testers = {
    groups = ["default"];
@@ -322,27 +404,27 @@
    };
    version = "1.1.3";
  };
-  google-api-client = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+  google-apis-androidpublisher_v3 = {
+    dependencies = ["google-apis-core"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
+      sha256 = "0qc501qhgks10qr7dm42bjcsm6yrbg1lxy28akpxindvjk61zh9i";
      type = "gem";
    };
-    version = "0.38.0";
+    version = "0.19.0";
  };
  google-apis-core = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1jx4jiyfjxd8pxlpi94f07cb5yvljb5rv7i8xzjq2xrrlvdf212a";
+      sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b";
      type = "gem";
    };
-    version = "0.3.0";
+    version = "0.4.2";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = ["google-apis-core"];
@@ -350,10 +432,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1gqpxcc0cjv4838q38g3mx9pgk7681w6irr6zwcygvnvbsvbbpsh";
+      sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn";
      type = "gem";
    };
-    version = "0.3.0";
+    version = "0.10.0";
+  };
+  google-apis-playcustomapp_v1 = {
+    dependencies = ["google-apis-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd";
+      type = "gem";
+    };
+    version = "0.7.0";
  };
  google-apis-storage_v1 = {
    dependencies = ["google-apis-core"];
@@ -361,10 +454,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0q6d5grhrkyfxmzlv0y39i6wzq5ayq1lkp33vfcg9pm8jyzcz7b2";
+      sha256 = "0lcb9jkjipz1kgg8zyp8a6741andads55bxbldg3x8qmzkv9pv31";
      type = "gem";
    };
-    version = "0.3.0";
+    version = "0.13.0";
  };
  google-cloud-core = {
    dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -383,20 +476,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
+      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
      type = "gem";
    };
-    version = "1.5.0";
+    version = "1.6.0";
  };
  google-cloud-errors = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0q3h996b6vl2ryfbm9jwczjcbnwhkpqs6hingxp22rhzk7qxi9z0";
+      sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "1.2.0";
  };
  google-cloud-storage = {
    dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
@@ -404,10 +497,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bjkwnsii4svw2g09xjqpkq3mck820kj9nhx3vlv7rjmlh3bg68s";
+      sha256 = "09d1bvxma4czbgay9lhcqsrhh6pd8s9i5djflzpsn00h4isdilw3";
      type = "gem";
    };
-    version = "1.31.0";
+    version = "1.36.2";
  };
  googleauth = {
    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -415,20 +508,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1438alhx4n4rdgf6q7ni8qj1b10y8lr9z9spphhjyhacby1ifsjn";
+      sha256 = "1y80y72bpz04piiskfn93i5rzfy02mjchp3ym77yf2811gzz33d9";
      type = "gem";
    };
-    version = "0.16.1";
+    version = "1.1.3";
  };
  highline = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
      type = "gem";
    };
-    version = "1.7.10";
+    version = "2.0.3";
  };
  http-accept = {
    groups = ["default"];
@@ -446,10 +539,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
      type = "gem";
    };
-    version = "1.0.3";
+    version = "1.0.4";
  };
  httpclient = {
    groups = ["default"];
@@ -466,30 +559,30 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+      sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
      type = "gem";
    };
-    version = "1.4.0";
+    version = "1.6.1";
  };
  json = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+      sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
      type = "gem";
    };
-    version = "2.5.1";
+    version = "2.6.1";
  };
  jwt = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
+      sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
      type = "gem";
    };
-    version = "2.2.2";
+    version = "2.3.0";
  };
  memoist = {
    groups = ["default"];
@@ -507,20 +600,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
      type = "gem";
    };
-    version = "3.3.1";
+    version = "3.4.1";
  };
  mime-types-data = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
+      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
      type = "gem";
    };
-    version = "3.2021.0225";
+    version = "3.2022.0105";
  };
  mini_magick = {
    groups = ["default"];
@@ -537,10 +630,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
+      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "1.1.2";
  };
  multi_json = {
    groups = ["default"];
@@ -592,15 +685,25 @@
    };
    version = "0.11.0";
  };
+  optparse = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
  os = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
+      sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
      type = "gem";
    };
-    version = "1.1.1";
+    version = "1.1.4";
  };
  plist = {
    groups = ["default"];
@@ -617,31 +720,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
      type = "gem";
    };
-    version = "4.0.6";
+    version = "4.0.7";
  };
  rake = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
      type = "gem";
    };
-    version = "13.0.3";
+    version = "13.0.6";
  };
  representable = {
-    dependencies = ["declarative" "declarative-option" "uber"];
+    dependencies = ["declarative" "trailblazer-option" "uber"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+      sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys";
      type = "gem";
    };
-    version = "3.0.4";
+    version = "3.1.1";
  };
  rest-client = {
    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
@@ -689,20 +792,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
      type = "gem";
    };
-    version = "0.0.4";
+    version = "0.0.5";
  };
  rubyzip = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
+      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.3.2";
  };
  security = {
    groups = ["default"];
@@ -720,10 +823,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vvxmfm9khxp35xs8qxc82i7hakylxbn7kx4apinvxaid6rlq60g";
+      sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1";
      type = "gem";
    };
-    version = "0.15.0";
+    version = "0.16.1";
  };
  simctl = {
    dependencies = ["CFPropertyList" "naturally"];
@@ -736,16 +839,6 @@
    };
    version = "1.6.8";
  };
-  slack-notifier = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
-      type = "gem";
-    };
-    version = "2.3.2";
-  };
  terminal-notifier = {
    groups = ["default"];
    platforms = [];
@@ -767,6 +860,16 @@
    };
    version = "1.8.0";
  };
+  trailblazer-option = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
  tty-cursor = {
    groups = ["default"];
    platforms = [];
@@ -824,20 +927,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+      sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz";
      type = "gem";
    };
-    version = "0.0.7.7";
+    version = "0.0.8.1";
  };
  unicode-display_width = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
      type = "gem";
    };
-    version = "1.7.0";
+    version = "1.8.0";
  };
  webrick = {
    groups = ["default"];
@@ -860,15 +963,15 @@
    version = "1.0.0";
  };
  xcodeproj = {
-    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
+      sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
      type = "gem";
    };
-    version = "1.19.0";
+    version = "1.21.0";
  };
  xcpretty = {
    dependencies = ["rouge"];
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .16.0
 .19.0