Merge branch 'develop' of github.com:MetaMask/metamask-mobile into pa…

…tch-1

* 'develop' of github.com:MetaMask/metamask-mobile: (51 commits)
  Feature/confusables (MetaMask#2464)
  fix typeface on login text field (MetaMask#2610)
  Replace controller context (MetaMask#2416)
  Fix adding custom token in custom network (MetaMask#2590)
  only add custom tokens if not in mainnet (MetaMask#2470)
  Address yarn lints (MetaMask#2524)
  Upgrade .nvmrc to node v14 (MetaMask#2588)
  Swaps: Add cache thresholds configuration (MetaMask#2514)
  Swaps: BSC Support (MetaMask#2468)
  Use node 14 (MetaMask#2539)
  resolve isENS without case sensitivity (MetaMask#2545) (MetaMask#2568)
  Revert "resolve isENS without case sensitivity (MetaMask#2545)" (MetaMask#2566)
  resolve isENS without case sensitivity (MetaMask#2545)
  Bump versioncode (MetaMask#2558)
  v2.2.0 (MetaMask#2555)
  Include decimalsToShow in balanceToFiatNumber (MetaMask#2547)
  Bug fix/sync import time (MetaMask#2554)
  bundle update (MetaMask#2549)
  Fix analytics try catch (MetaMask#2546)
  Only get nonce from the network if the feature is enabled (MetaMask#2543)
  ...

.circleci/config.yml

@@ -20,7 +20,7 @@ jobs:
   prep-deps:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - run:
@@ -33,7 +33,7 @@ jobs:
   prep-node-deps:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - restore_cache: *restore-node-cache
@@ -49,7 +49,7 @@ jobs:
   lint:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - attach_workspace:
@@ -60,7 +60,7 @@ jobs:
     <<: *defaults
     parallelism: 3
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - attach_workspace:
@@ -74,7 +74,7 @@ jobs:
   test-deps:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - attach_workspace:
@@ -106,7 +106,7 @@ jobs:
   upload-coverage:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - attach_workspace:
@@ -117,7 +117,7 @@ jobs:
   all-tests-pass:
     <<: *defaults
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - run:
           name:  All Tests Passed
@@ -199,13 +199,13 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - develop
       - prep-node-deps:
           filters:
             branches:
               ignore:
-                - master
+                - main
                 - develop
       - lint:
           requires:

.eslintrc.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-commonjs
 module.exports = {
 	root: true,
 	parser: 'babel-eslint',

.nvmrc

@@ -1 +1 @@
-v10
+v14

CHANGELOG.md

@@ -1,5 +1,61 @@
 # Changelog
 
+## v2.2.0 - Apr 21 2021
+- [#2547](https://github.com/MetaMask/metamask-mobile/pull/2547): Include decimalsToShow in balanceToFiatNumber
+- [#2554](https://github.com/MetaMask/metamask-mobile/pull/2554): Bug fix/sync import time
+- [#2546](https://github.com/MetaMask/metamask-mobile/pull/2546): Fix analytics try catch
+- [#2543](https://github.com/MetaMask/metamask-mobile/pull/2543): Only get nonce from the network if the feature is enabled
+- [#2460](https://github.com/MetaMask/metamask-mobile/pull/2460): Feature/tx local state logs
+- [#2540](https://github.com/MetaMask/metamask-mobile/pull/2540): bump v2.1.2
+- [#2538](https://github.com/MetaMask/metamask-mobile/pull/2538): fix/connection change handler
+- [#2375](https://github.com/MetaMask/metamask-mobile/pull/2375): Style updates
+- [#2536](https://github.com/MetaMask/metamask-mobile/pull/2536): Change Send Feedback to Request a Feature and update link
+- [#2485](https://github.com/MetaMask/metamask-mobile/pull/2485): Fix notification so it doesn't block terms + conditions
+- [#2469](https://github.com/MetaMask/metamask-mobile/pull/2469): Bug/persists old account names
+- [#2534](https://github.com/MetaMask/metamask-mobile/pull/2534): Fix typo
+- [#2373](https://github.com/MetaMask/metamask-mobile/pull/2373): use contract metadata version from package
+- [#2520](https://github.com/MetaMask/metamask-mobile/pull/2520): Check infura availability
+- [#2371](https://github.com/MetaMask/metamask-mobile/pull/2371): Feature/custom nonce
+- [#2521](https://github.com/MetaMask/metamask-mobile/pull/2521): Bump v2.1.1
+- [#2493](https://github.com/MetaMask/metamask-mobile/pull/2493): rename master to main
+- [#2447](https://github.com/MetaMask/metamask-mobile/pull/2447): Bump vm-browserify from 0.0.4 to 1.1.2
+- [#2501](https://github.com/MetaMask/metamask-mobile/pull/2501): Bump jest-serializer from 24.4.0 to 26.6.2
+- [#2499](https://github.com/MetaMask/metamask-mobile/pull/2499): Bump react-native-share from 3.3.2 to 5.2.2
+- [#2411](https://github.com/MetaMask/metamask-mobile/pull/2411): Bump json-rpc-middleware-stream from 2.1.1 to 3.0.0
+- [#2406](https://github.com/MetaMask/metamask-mobile/pull/2406): Bump eslint-plugin-prettier from 3.3.0 to 3.3.1
+- [#2403](https://github.com/MetaMask/metamask-mobile/pull/2403): Bump babel-eslint from 10.0.3 to 10.1.0
+- [#2381](https://github.com/MetaMask/metamask-mobile/pull/2381): Display correct number of decimals for 'usd' fiat
+
+## v2.1.3 - Apr 19 2021
+- [#2548](https://github.com/MetaMask/metamask-mobile/pull/2548): Hotfix analytics try catch
+
+## v2.1.2 - Apr 16 2021
+- [#2538](https://github.com/MetaMask/metamask-mobile/pull/2538): fix/connection change handler
+
+## v2.1.1 - Apr 14 2021
+- [#2520](https://github.com/MetaMask/metamask-mobile/pull/2520): Check provider status
+
+## v2.1.0 - Apr 12 2021
+- [#2487](https://github.com/MetaMask/metamask-mobile/pull/2487): Fix/analytics v1 priority1
+- [#2456](https://github.com/MetaMask/metamask-mobile/pull/2456): Analytics v2 (priority 1)
+- [#2408](https://github.com/MetaMask/metamask-mobile/pull/2408): Fix/gas estimations
+- [#2479](https://github.com/MetaMask/metamask-mobile/pull/2479): remove controllers tgz
+- [#2441](https://github.com/MetaMask/metamask-mobile/pull/2441): Improvement/assets by chainid
+- [#2442](https://github.com/MetaMask/metamask-mobile/pull/2442): Improvement/chain ticker
+- [#2372](https://github.com/MetaMask/metamask-mobile/pull/2372): Remove instapay
+- [#2467](https://github.com/MetaMask/metamask-mobile/pull/2467): Fix iOS build
+- [#2084](https://github.com/MetaMask/metamask-mobile/pull/2084): Migrate from AsyncStorage to FileStorage
+- [#2443](https://github.com/MetaMask/metamask-mobile/pull/2443): Update terms and privacy links
+- [#2318](https://github.com/MetaMask/metamask-mobile/pull/2318): Add custom network rpc API
+- [#2306](https://github.com/MetaMask/metamask-mobile/pull/2306): Feature/high gas warn
+- [#2463](https://github.com/MetaMask/metamask-mobile/pull/2463): update pods
+- [#2448](https://github.com/MetaMask/metamask-mobile/pull/2448): Add resolution for netmask
+- [#2445](https://github.com/MetaMask/metamask-mobile/pull/2445): Add resolution for y18n
+- [#2404](https://github.com/MetaMask/metamask-mobile/pull/2404): Bump react-native-branch from 5.0.0 to 5.0.1
+- [#2439](https://github.com/MetaMask/metamask-mobile/pull/2439): json-rpc-engine@6.1.0
+- [#2413](https://github.com/MetaMask/metamask-mobile/pull/2413): remove "git add" per husky warning
+- [#2431](https://github.com/MetaMask/metamask-mobile/pull/2431): Update BN import
+
 ## v2.0.1 - Mar 24 2021
 - [#2430](https://github.com/MetaMask/metamask-mobile/pull/2430): Fix/send to style
 - [#2426](https://github.com/MetaMask/metamask-mobile/pull/2426): bugfix/allow seedphrases when locked

RELEASE.MD

@@ -47,6 +47,6 @@
 
 ### Once you're done with both stores:
 - Submit a PR with the changes
-- Once it's merged create a tag on master for that version
+- Once it's merged create a tag on main for that version
 - Go to the release pages and create a new release for that tag, including the changelog
 

android/app/build.gradle

@@ -166,8 +166,8 @@ android {
 		applicationId "io.metamask"
 		minSdkVersion rootProject.ext.minSdkVersion
 		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 49
-		versionName "2.0.1"
+		versionCode 54
+		versionName "2.2.0"
 		multiDexEnabled true
 		testBuildType System.getProperty('testBuildType', 'debug')
 		missingDimensionStrategy "minReactNative", "minReactNative46"

app/__mocks__/rn-fetch-blob.js

@@ -9,6 +9,7 @@ export default {
 	config: noop,
 	session: noop,
 	fs: {
+		writeFile: () => Promise.resolve(),
 		exists: () => Promise.resolve(),
 		dirs: {
 			CacheDir: noop,

app/actions/infuraAvailability/index.js

@@ -0,0 +1,13 @@
+import { INFURA_AVAILABILITY_BLOCKED, INFURA_AVAILABILITY_NOT_BLOCKED } from '../../reducers/infuraAvailability';
+
+export function setInfuraAvailabilityBlocked() {
+	return {
+		type: INFURA_AVAILABILITY_BLOCKED
+	};
+}
+
+export function setInfuraAvailabilityNotBlocked() {
+	return {
+		type: INFURA_AVAILABILITY_NOT_BLOCKED
+	};
+}

app/actions/settings/index.js

@@ -12,6 +12,13 @@ export function setShowHexData(showHexData) {
 	};
 }
 
+export function setShowCustomNonce(showCustomNonce) {
+	return {
+		type: 'SET_SHOW_CUSTOM_NONCE',
+		showCustomNonce
+	};
+}
+
 export function setLockTime(lockTime) {
 	return {
 		type: 'SET_LOCK_TIME',

app/actions/transaction/index.js

@@ -172,3 +172,17 @@ export function setCollectibleContractTransaction(collectible) {
 		collectible
 	};
 }
+
+export function setNonce(nonce) {
+	return {
+		type: 'SET_NONCE',
+		nonce
+	};
+}
+
+export function setProposedNonce(proposedNonce) {
+	return {
+		type: 'SET_PROPOSED_NONCE',
+		proposedNonce
+	};
+}

app/components/Base/Text.js

@@ -16,7 +16,16 @@ const style = StyleSheet.create({
 	right: {
 		textAlign: 'right'
 	},
+	red: {
+		color: colors.red
+	},
+	black: {
+		color: colors.black
+	},
 	bold: fontStyles.bold,
+	blue: {
+		color: colors.blue
+	},
 	green: {
 		color: colors.green400
 	},
@@ -58,6 +67,9 @@ const Text = ({
 	right,
 	bold,
 	green,
+	black,
+	blue,
+	red,
 	primary,
 	small,
 	upper,
@@ -77,6 +89,10 @@ const Text = ({
 			right && style.right,
 			bold && style.bold,
 			green && style.green,
+			black && style.black,
+			blue && style.blue,
+			red && style.red,
+			black && style.black,
 			primary && style.primary,
 			disclaimer && [style.small, style.disclaimer],
 			small && style.small,
@@ -98,6 +114,9 @@ Text.defaultProps = {
 	right: false,
 	bold: false,
 	green: false,
+	black: false,
+	blue: false,
+	red: false,
 	primary: false,
 	disclaimer: false,
 	modal: false,
@@ -130,6 +149,18 @@ Text.propTypes = {
 	 * Makes text green
 	 */
 	green: PropTypes.bool,
+	/**
+	 * Makes text black
+	 */
+	black: PropTypes.bool,
+	/**
+	 * Makes text blue
+	 */
+	blue: PropTypes.bool,
+	/**
+	 * Makes text red
+	 */
+	red: PropTypes.bool,
 	/**
 	 * Makes text fontPrimary color
 	 */