Merge branch 'develop' into feature/confusables

* develop: v2.1.0 (#2481) Analytics v2 (priority 1) (#2456) Fix/gas estimations (#2408) remove controllers tgz (#2479) Improvement/assets by chainid (#2441) Improvement/chain ticker (#2442) Remove instapay (#2372) Fix iOS build (#2467) Migrate from AsyncStorage to FileStorage (#2084)
MetaMask · Apr 8, 2021 · 6f99419 · 6f99419
2 parents 524c6f3 + ade0934
commit 6f99419
Show file tree

Hide file tree

Showing 111 changed files with 1,921 additions and 4,870 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## Current Develop Branch
+
+## v2.1.0 - Apr 12 2021
+- [#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

diff --git a/android/app/build.gradle b/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 50
+		versionName "2.1.0"
 		multiDexEnabled true
 		testBuildType System.getProperty('testBuildType', 'debug')
 		missingDimensionStrategy "minReactNative", "minReactNative46"

diff --git a/app/__mocks__/rn-fetch-blob.js b/app/__mocks__/rn-fetch-blob.js
@@ -0,0 +1,19 @@
+const noop = () => ({});
+
+export default {
+	DocumentDir: noop,
+	fetch: noop,
+	base64: noop,
+	android: noop,
+	ios: noop,
+	config: noop,
+	session: noop,
+	fs: {
+		exists: () => Promise.resolve(),
+		dirs: {
+			CacheDir: noop,
+			DocumentDir: noop
+		}
+	},
+	wrap: noop
+};
diff --git a/app/actions/settings/index.js b/app/actions/settings/index.js
@@ -26,13 +26,6 @@ export function setPrimaryCurrency(primaryCurrency) {
 	};
 }
 
-export function setEnablePaymentChannels(paymentChannelsEnabled) {
-	return {
-		type: 'SET_ENABLE_PAYMENT_CHANNELS',
-		paymentChannelsEnabled
-	};
-}
-
 export function setUseBlockieIcon(useBlockieIcon) {
 	return {
 		type: 'SET_USE_BLOCKIE_ICON',

diff --git a/app/actions/transaction/index.js b/app/actions/transaction/index.js
@@ -101,18 +101,6 @@ export function prepareFullTransaction({
 	};
 }
 
-/**
- * Sets any attribute in transaction object
- *
- * @param {object} transaction - New transaction object
- */
-export function setPaymentChannelTransaction(asset) {
-	return {
-		type: 'SET_PAYMENT_CHANNEL_TRANSACTION',
-		asset
-	};
-}
-
 /**
  * Sets any attribute in transaction object
  *