Updated status-go version

2021-11-03 16:38:43 +00:00
503 changed files with 8320 additions and 16968 deletions
@@ -1,5 +1,6 @@
 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
@@ -31,6 +31,3 @@ DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
-COMMANDS_ENABLED=1
-TWO_MINUTES_SYNCING=1
-SWAP_ENABLED=1
@@ -33,4 +33,3 @@ COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
@@ -35,5 +35,3 @@ COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
-ENABLE_QUO_PREVIEW=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 ([guide](https://notes.status.im/how-to-prepare-release-notes))
+- [ ] 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))
 - [ ] 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 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, more info [here](https://notes.status.im/how-to-update-assets)
+- [ ] 6. Make sure that assets (screenshots, video) in stores are up to date. If should be updated, ask @cammellos  for help

 #### 2) Testing
 [comment]: # (Section will be maintained by QA)
@@ -53,15 +53,14 @@ Upgrade (e2e):

 #### 3) Submission

- [ ] 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)
-
+- [ ] 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))

 #### 4) Before publishing
 - [ ] 1. Translations for comms available (marketing, ask in the channel)
@@ -69,7 +68,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 + get review on blog from QA team)
+- [ ] 1. Notify marketing to push comms and blog post (Jonny)
 - [ ] 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: 'status-react/e2e/status-app-prs'
+  job-full-name: 'end-to-end-tests/status-app-prs'
  kickoff-column-name: 'E2E Tests'

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

 ##appium
 test/appium/report/
-result.xml
-test/appium/tests/users.py
+result.xml
@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm _install-hooks
+.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
@@ -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
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE

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

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

-shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
@@ -124,11 +127,6 @@ _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
@@ -205,9 +203,8 @@ 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
-	scripts/google-free.sh
+	sed -i -e '$$aGOOGLE_FREE=1' .env.release
 	scripts/release-android.sh

 release-ios: export TARGET := ios
@@ -1,38 +1,3 @@
-## 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
@@ -1 +1 @@
-1.19.0
+1.17.0
@@ -126,7 +126,7 @@ 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", 0) == '1'
+def googleFree = project.env.get("GOOGLE_FREE", false)

 def getCommitHash = { ->
    if (project.hasProperty("commitHash")) {
@@ -341,8 +341,6 @@ 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
@@ -360,7 +358,6 @@ dependencies {
    implementation 'com.github.status-im:function:0.0.1'
    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 = { ->
@@ -396,7 +393,3 @@ 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"
-}
@@ -1,119 +0,0 @@
-{
-  "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,15 +64,3 @@
 -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 *;
-}
@@ -81,12 +81,6 @@
                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>
@@ -15,14 +15,12 @@ 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 {

@@ -58,9 +56,7 @@ 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());
    }
@@ -1,44 +0,0 @@
-package im.status.ethereum;
-
-import android.util.Log;
-
-import com.facebook.react.modules.network.OkHttpClientFactory;
-import com.facebook.react.modules.network.OkHttpClientProvider;
-
-import okhttp3.OkHttpClient;
-import okhttp3.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();
-  }
-}
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="alert_background">#141414</color>
-  <color name="alert_text">#ffffff</color>
-</resources>
@@ -1,6 +0,0 @@
-<?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,7 +8,6 @@
        <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">
@@ -22,10 +21,4 @@
        <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>
@@ -22,7 +22,6 @@ 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.
    }
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.5'
+library 'status-jenkins-lib@v1.3.3'

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

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

 pipeline {
  agent { label 'linux' }
@@ -101,7 +101,7 @@ pipeline {
      steps { script {
        e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
        build(
-          job: 'status-react/e2e/status-app-nightly',
+          job: 'end-to-end-tests/status-app-nightly',
          parameters: [string(name: 'APK_NAME', value: e2eApk)],
          wait: false
        )
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.5'
+library 'status-jenkins-lib@v1.3.3'

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

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

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -4,13 +4,13 @@ pipeline {

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

@@ -48,22 +48,16 @@ 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\" \
-                -k \"${params.KEYWORD_EXPRESSION}\" \
+                -m "not upgrade" \
+                --network=${params.NETWORK} \
                --apk=${params.APK_NAME}
            """
          }
@@ -8,12 +8,16 @@ pipeline {
      description: 'Name of the branch to checkout and build.',
      defaultValue: 'develop',
    )
-/* Commented to use TEST_MARKERS values from job params
+    string(
+      name: 'NETWORK',
+      description: 'Name of test network to use.',
+      defaultValue: 'ropsten',
+    )
    string(
      name: 'TEST_MARKERS',
      description: 'Marker expression for matching tests to run.',
      defaultValue: 'critical or high',
-    ) */
+    )
    string(
      name: 'APK_NAME',
      description: 'Filename of APK uploaded to SauceLabs, path, or URL.',
@@ -22,14 +26,9 @@ 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: '',
    )
  }
@@ -85,21 +84,15 @@ 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 \
                --rerun_count=2 \
                --testrail_report=True \
-                -m \"${params.TEST_MARKERS}\" \
-                -k \"${params.KEYWORD_EXPRESSION}\" \
+                -m "${params.TEST_MARKERS}" \
+                --network=${params.NETWORK} \
                --apk=${params.APK_NAME} \
                --build=PR-${params.PR_ID} \
                --pr_number=${params.PR_ID} \
@@ -3,6 +3,11 @@ 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)',
@@ -11,16 +16,6 @@ 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 {
@@ -37,12 +32,7 @@ pipeline {
      } }
    }
    stage('Test') {
-      steps { script {
-       /* for managing optional arguments */
-        def extraPytestOpts = ''
-        if (params.TR_CASE_IDS != '') {
-          extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
-        }
+      steps {
        withCredentials([
          usernamePassword(
            credentialsId:  'test-rail-api',
@@ -62,29 +52,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 \
-                -m "upgrade" \
-                -k \"${params.KEYWORD_EXPRESSION}\" \
+                -m upgrade \
                --numprocesses 15 \
                --rerun_count=2 \
                --testrail_report=True \
+                --network=${params.NETWORK} \
                --apk=${params.APK_NAME} \
-                --apk_upgrade=${params.APK_NAME_UPGRADE} \
-                 ${extraPytestOpts}
+                --apk_upgrade=${params.APK_NAME_UPGRADE}
            """
          }
        }
      }
-    } }
+    }
  }

  post {
@@ -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: "maci7-0${(currentBuild.startTimeInMillis % 3) + 1}",
+      defaultValue: "macos-0${(currentBuild.startTimeInMillis % 3) + 1}",
    )
  }

@@ -163,8 +163,4 @@ 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
+Used for taking emoji input, for custom emoji thumbnails for community channels
@@ -10,6 +10,13 @@ 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:
@@ -21,25 +28,6 @@ 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,76 +1,62 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.4)
-      rexml
-    addressable (2.8.0)
+    CFPropertyList (3.0.3)
+    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    artifactory (3.0.15)
    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.525.0)
-    aws-sdk-core (3.122.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.442.0)
+    aws-sdk-core (3.113.1)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.93.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.3)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.0.3)
    colored (1.2)
    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    declarative-option (0.1.0)
+    digest-crc (0.6.3)
      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.3)
-    excon (0.88.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+    emoji_regex (3.2.2)
+    excon (0.79.0)
+    faraday (1.3.0)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
+      ruby2_keywords
    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-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.0.0)
      faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.197.0)
+    fastimage (2.2.3)
+    fastlane (2.179.0)
      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
+      addressable (>= 2.3, < 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 (~> 4.6)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
      emoji_regex (>= 0.1, < 4.0)
      excon (>= 0.71.0, < 1.0.0)
@@ -79,20 +65,19 @@ GEM
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.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)
      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)
@@ -105,71 +90,75 @@ GEM
    fastlane-plugin-diawi (2.1.0)
      rest-client (>= 2.0.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.13.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-api-client (0.38.0)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
+      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)
      rexml
+      signet (~> 0.14)
      webrick
-    google-apis-iamcredentials_v1 (0.8.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
-      google-apis-core (>= 0.4, < 2.a)
+    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-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.2.0)
-    google-cloud-storage (1.34.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.31.0)
      addressable (~> 2.5)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
      mini_mime (~> 1.0)
-    googleauth (1.1.0)
+    googleauth (0.16.1)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
+      signet (~> 0.14)
+    highline (1.7.10)
    http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.4.0)
-    json (2.6.1)
-    jwt (2.3.0)
+    json (2.5.1)
+    jwt (2.2.2)
    memoist (0.16.2)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.0225)
    mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.0)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    netrc (0.11.0)
-    optparse (0.1.1)
-    os (1.1.4)
+    os (1.1.1)
    plist (3.6.0)
    public_suffix (4.0.6)
-    rake (13.0.6)
-    representable (3.1.1)
+    rake (13.0.3)
+    representable (3.0.4)
      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
+      declarative-option (< 0.2.0)
      uber (< 0.2.0)
    rest-client (2.1.0)
      http-accept (>= 1.7.0, < 2.0)
@@ -179,21 +168,21 @@ GEM
    retriable (3.1.2)
    rexml (3.2.5)
    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
    security (0.1.3)
-    signet (0.16.0)
-      addressable (~> 2.8)
+    signet (0.15.0)
+      addressable (~> 2.3)
      faraday (>= 0.17.3, < 2.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)
@@ -201,17 +190,16 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.8.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.19.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 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.7.0";
  };
  artifactory = {
    groups = ["default"];
@@ -35,20 +35,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.1.1";
  };
  aws-partitions = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9";
+      sha256 = "0lm08fmahg3m87vbsfv73iswgvicdwcxfmkzr6v9qshlkg36lafd";
      type = "gem";
    };
-    version = "1.525.0";
+    version = "1.442.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0krx8cfajc72gv6mpyb67vnhd2m2iya19846jgipgfris194gjm2";
+      sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0";
      type = "gem";
    };
-    version = "3.122.0";
+    version = "3.113.1";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0qac9dd6qriz6ldghkr8ga74zz28jl109kmvhvag74a3qf7k9dwj";
+      sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
      type = "gem";
    };
-    version = "1.51.0";
+    version = "1.43.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7";
+      sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
      type = "gem";
    };
-    version = "1.105.1";
+    version = "1.93.0";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -89,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
+      sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
      type = "gem";
    };
-    version = "1.4.0";
+    version = "1.2.3";
  };
  babosa = {
    groups = ["default"];
@@ -105,15 +105,14 @@
    version = "1.0.4";
  };
  CFPropertyList = {
-    dependencies = ["rexml"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk";
+      sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
      type = "gem";
    };
-    version = "3.0.4";
+    version = "3.0.3";
  };
  claide = {
    groups = ["default"];
@@ -145,16 +144,16 @@
    };
    version = "3.1.2";
  };
-  commander = {
+  commander-fastlane = {
    dependencies = ["highline"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
+      sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
      type = "gem";
    };
-    version = "4.6.0";
+    version = "4.4.6";
  };
  declarative = {
    groups = ["default"];
@@ -166,16 +165,26 @@
    };
    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 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
+      sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
      type = "gem";
    };
-    version = "0.6.4";
+    version = "0.6.3";
  };
  domain_name = {
    dependencies = ["unf"];
@@ -203,31 +212,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c";
+      sha256 = "15xqimc9dr9yyrf09dy8g60s65bvgg6xyyr7q74352r9vhwyg357";
      type = "gem";
    };
-    version = "3.2.3";
+    version = "3.2.2";
  };
  excon = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr";
+      sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23";
      type = "gem";
    };
-    version = "0.88.0";
+    version = "0.79.0";
  };
  faraday = {
-    dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
+    dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
+      sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "1.3.0";
  };
  faraday-cookie_jar = {
    dependencies = ["faraday" "http-cookie"];
@@ -240,46 +249,6 @@
    };
    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-net_http = {
    groups = ["default"];
    platforms = [];
@@ -290,67 +259,37 @@
    };
    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_middleware = {
    dependencies = ["faraday"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+      sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.0.0";
  };
  fastimage = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05i1fgqy4l40niwm9y56d04f876sm0cvc7q3w2rpddf8gya4lcs9";
+      sha256 = "0lgr0vs9kg5622qaf2l3f37b238dncs037fisiygvkbq8sg11i68";
      type = "gem";
    };
-    version = "2.2.5";
+    version = "2.2.3";
  };
  fastlane = {
-    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"];
+    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"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1qlvg0sca8j1ryzxpvnmpjnh3fwmv6sk8l7mr9mv34z8rdy1iv3x";
+      sha256 = "1wspwgc1q31049a20k2gnzmizdvq4jdmzyd2fnz7r4g68fygj3sj";
      type = "gem";
    };
-    version = "2.197.0";
+    version = "2.179.0";
  };
  fastlane-plugin-clean_testflight_testers = {
    groups = ["default"];
@@ -383,27 +322,27 @@
    };
    version = "1.1.3";
  };
-  google-apis-androidpublisher_v3 = {
-    dependencies = ["google-apis-core"];
+  google-api-client = {
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nxgda00y080xdavxs6nv5h2grwamds33b25nkjb4mij7385brs1";
+      sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.38.0";
  };
  google-apis-core = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nzzj66clgr9ldmbjqkzgpvqmd6bjjmbw6khpgq80mp3gks4ycqy";
+      sha256 = "1jx4jiyfjxd8pxlpi94f07cb5yvljb5rv7i8xzjq2xrrlvdf212a";
      type = "gem";
    };
-    version = "0.4.1";
+    version = "0.3.0";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = ["google-apis-core"];
@@ -411,21 +350,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0slpmdjsxbjdqs7qwkyfk3sdnfy5wliwf89jy8hq7l87a31r7lvk";
+      sha256 = "1gqpxcc0cjv4838q38g3mx9pgk7681w6irr6zwcygvnvbsvbbpsh";
      type = "gem";
    };
-    version = "0.8.0";
-  };
-  google-apis-playcustomapp_v1 = {
-    dependencies = ["google-apis-core"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v9y6avlnwxwv4vahhygrsmrpmric4zg8sxjd26vhhlxw6g8955b";
-      type = "gem";
-    };
-    version = "0.6.0";
+    version = "0.3.0";
  };
  google-apis-storage_v1 = {
    dependencies = ["google-apis-core"];
@@ -433,10 +361,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y6gyqj2cwsbdxk7wsrjzp9jz2hn2bk1zi1jjm5k311c3jlnj0r1";
+      sha256 = "0q6d5grhrkyfxmzlv0y39i6wzq5ayq1lkp33vfcg9pm8jyzcz7b2";
      type = "gem";
    };
-    version = "0.9.0";
+    version = "0.3.0";
  };
  google-cloud-core = {
    dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -465,10 +393,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd";
+      sha256 = "0q3h996b6vl2ryfbm9jwczjcbnwhkpqs6hingxp22rhzk7qxi9z0";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.1.0";
  };
  google-cloud-storage = {
    dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
@@ -476,10 +404,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pvcpqx64cxm05dzr9q7zxrymjq4jk46ifd1p4b6c9v3v0c9ipb5";
+      sha256 = "1bjkwnsii4svw2g09xjqpkq3mck820kj9nhx3vlv7rjmlh3bg68s";
      type = "gem";
    };
-    version = "1.34.1";
+    version = "1.31.0";
  };
  googleauth = {
    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -487,20 +415,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12zm6r7jxqv8k1a4iyijq2gcywk2d62nizbnabwsnhnzxwxwxc3s";
+      sha256 = "1438alhx4n4rdgf6q7ni8qj1b10y8lr9z9spphhjyhacby1ifsjn";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "0.16.1";
  };
  highline = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+      sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
      type = "gem";
    };
-    version = "2.0.3";
+    version = "1.7.10";
  };
  http-accept = {
    groups = ["default"];
@@ -518,10 +446,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
      type = "gem";
    };
-    version = "1.0.4";
+    version = "1.0.3";
  };
  httpclient = {
    groups = ["default"];
@@ -548,20 +476,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
      type = "gem";
    };
-    version = "2.6.1";
+    version = "2.5.1";
  };
  jwt = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
+      sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.2.2";
  };
  memoist = {
    groups = ["default"];
@@ -589,10 +517,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
+      sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
      type = "gem";
    };
-    version = "3.2021.0901";
+    version = "3.2021.0225";
  };
  mini_magick = {
    groups = ["default"];
@@ -609,10 +537,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
+      sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
      type = "gem";
    };
-    version = "1.1.2";
+    version = "1.1.0";
  };
  multi_json = {
    groups = ["default"];
@@ -664,25 +592,15 @@
    };
    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 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
+      sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
      type = "gem";
    };
-    version = "1.1.4";
+    version = "1.1.1";
  };
  plist = {
    groups = ["default"];
@@ -709,21 +627,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
      type = "gem";
    };
-    version = "13.0.6";
+    version = "13.0.3";
  };
  representable = {
-    dependencies = ["declarative" "trailblazer-option" "uber"];
+    dependencies = ["declarative" "declarative-option" "uber"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys";
+      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
      type = "gem";
    };
-    version = "3.1.1";
+    version = "3.0.4";
  };
  rest-client = {
    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
@@ -771,20 +689,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
      type = "gem";
    };
-    version = "0.0.5";
+    version = "0.0.4";
  };
  rubyzip = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
      type = "gem";
    };
-    version = "2.3.2";
+    version = "2.3.0";
  };
  security = {
    groups = ["default"];
@@ -802,10 +720,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k";
+      sha256 = "1vvxmfm9khxp35xs8qxc82i7hakylxbn7kx4apinvxaid6rlq60g";
      type = "gem";
    };
-    version = "0.16.0";
+    version = "0.15.0";
  };
  simctl = {
    dependencies = ["CFPropertyList" "naturally"];
@@ -818,6 +736,16 @@
    };
    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 = [];
@@ -839,16 +767,6 @@
    };
    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 = [];
@@ -906,20 +824,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
+      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
      type = "gem";
    };
-    version = "0.0.8";
+    version = "0.0.7.7";
  };
  unicode-display_width = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "1.7.0";
  };
  webrick = {
    groups = ["default"];
@@ -942,15 +860,15 @@
    version = "1.0.0";
  };
  xcodeproj = {
-    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
+      sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
      type = "gem";
    };
-    version = "1.21.0";
+    version = "1.19.0";
  };
  xcpretty = {
    dependencies = ["rouge"];
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .19.0
 .17.0