Merge branch 'develop' into feature/eip1559-base-edit-gas-fee-screen

* develop: Remove Picker deprecation warning (#2709) Don't render swap router address in recents (#2823) bumped version (#2843) Lionbridge latest translations for secret recovery phrase and subtitle files (#2743)
MetaMask · Jun 29, 2021 · 5ffa183 · 5ffa183
2 parents 925ee16 + eebce6b
commit 5ffa183
Show file tree

Hide file tree

Showing 49 changed files with 6,116 additions and 3,323 deletions.
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 750
-		versionName "2.5.0"
+		versionCode 751
+		versionName "2.6.0"
 		multiDexEnabled true
 		testBuildType System.getProperty('testBuildType', 'debug')
 		missingDimensionStrategy "minReactNative", "minReactNative46"

diff --git a/app/components/UI/AddCustomCollectible/index.js b/app/components/UI/AddCustomCollectible/index.js
@@ -10,7 +10,7 @@ import { isSmartContractAddress } from '../../../util/transactions';
 import Device from '../../../util/Device';
 import { connect } from 'react-redux';
 import AnalyticsV2 from '../../../util/analyticsV2';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -169,7 +169,7 @@ class AddCustomCollectible extends PureComponent {
 		const { selectedAddress } = this.props;
 		try {
 			const owner = await AssetsContractController.getOwnerOf(address, tokenId);
-			return toLowerCaseCompare(owner, selectedAddress);
+			return toLowerCaseEquals(owner, selectedAddress);
 		} catch (e) {
 			return false;
 		}

diff --git a/app/components/UI/AssetSearch/index.js b/app/components/UI/AssetSearch/index.js
@@ -6,7 +6,7 @@ import { strings } from '../../../../locales/i18n';
 import contractMap from '@metamask/contract-metadata';
 import Fuse from 'fuse.js';
 import Icon from 'react-native-vector-icons/FontAwesome';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	searchSection: {
@@ -68,7 +68,7 @@ export default class AssetSearch extends PureComponent {
 	handleSearch = searchQuery => {
 		this.setState({ searchQuery });
 		const fuseSearchResult = fuse.search(searchQuery);
-		const addressSearchResult = contractList.filter(token => toLowerCaseCompare(token.address, searchQuery));
+		const addressSearchResult = contractList.filter(token => toLowerCaseEquals(token.address, searchQuery));
 		const results = [...addressSearchResult, ...fuseSearchResult];
 		this.props.onSearch({ searchQuery, results });
 	};

diff --git a/app/components/UI/CollectibleContractOverview/index.js b/app/components/UI/CollectibleContractOverview/index.js
@@ -10,7 +10,7 @@ import { toggleCollectibleContractModal } from '../../../actions/modals';
 import { connect } from 'react-redux';
 import collectiblesTransferInformation from '../../../util/collectibles-transfer';
 import { newAssetTransaction } from '../../../actions/transaction';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -86,7 +86,7 @@ class CollectibleContractOverview extends PureComponent {
 	onSend = () => {
 		const { collectibleContract, collectibles } = this.props;
 		const collectible = collectibles.find(collectible =>
-			toLowerCaseCompare(collectible.address, collectibleContract.address)
+			toLowerCaseEquals(collectible.address, collectibleContract.address)
 		);
 		this.props.newAssetTransaction(collectible);
 		this.props.navigation.navigate('SendFlowView');

diff --git a/app/components/UI/CollectibleContracts/index.js b/app/components/UI/CollectibleContracts/index.js
@@ -12,7 +12,7 @@ import CollectibleModal from '../CollectibleModal';
 import { favoritesCollectiblesObjectSelector } from '../../../reducers/collectibles';
 import Text from '../../Base/Text';
 import AppConstants from '../../../core/AppConstants';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -97,7 +97,7 @@ const CollectibleContracts = ({ collectibleContracts, collectibles, navigation,
 	const renderCollectibleContract = useCallback(
 		(item, index) => {
 			const contractCollectibles = collectibles?.filter(collectible =>
-				toLowerCaseCompare(collectible.address, item.address)
+				toLowerCaseEquals(collectible.address, item.address)
 			);
 			return (
 				<CollectibleContractElement

diff --git a/app/components/UI/EthInput/index.js b/app/components/UI/EthInput/index.js
@@ -25,7 +25,7 @@ import { getTicker, getNormalizedTxState } from '../../../util/transactions';
 import FontAwesome from 'react-native-vector-icons/FontAwesome';
 import Device from '../../../util/Device';
 import NetworkMainAssetLogo from '../NetworkMainAssetLogo';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	root: {
@@ -284,7 +284,7 @@ class EthInput extends PureComponent {
 				break;
 			case 'CONTRACT_COLLECTIBLE_TRANSACTION': {
 				const collectiblesToShow = collectibles.filter(collectible =>
-					toLowerCaseCompare(collectible.address, transaction.selectedAsset.address)
+					toLowerCaseEquals(collectible.address, transaction.selectedAsset.address)
 				);
 				this.setState({
 					assets: collectiblesToShow

diff --git a/app/components/UI/PaymentRequest/index.js b/app/components/UI/PaymentRequest/index.js
@@ -39,7 +39,7 @@ import Device from '../../../util/Device';
 import currencySymbols from '../../../util/currency-symbols.json';
 import { NetworksChainId } from '@metamask/controllers';
 import { getTicker } from '../../../util/transactions';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const KEYBOARD_OFFSET = 120;
 const styles = StyleSheet.create({
@@ -343,7 +343,7 @@ class PaymentRequest extends PureComponent {
 		}
 
 		const fuseSearchResult = fuse.search(searchInputValue);
-		const addressSearchResult = contractList.filter(token => toLowerCaseCompare(token.address, searchInputValue));
+		const addressSearchResult = contractList.filter(token => toLowerCaseEquals(token.address, searchInputValue));
 		const results = [...addressSearchResult, ...fuseSearchResult];
 		this.setState({ searchInputValue, results });
 	};

diff --git a/app/components/UI/SelectComponent/index.js b/app/components/UI/SelectComponent/index.js
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { ScrollView, StyleSheet, Text, View, TouchableOpacity, Picker } from 'react-native';
+import { ScrollView, StyleSheet, Text, View, TouchableOpacity } from 'react-native';
+import { Picker } from '@react-native-community/picker';
 import { fontStyles, colors, baseStyles } from '../../../styles/common';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 import Modal from 'react-native-modal';

diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
@@ -52,7 +52,7 @@ import useBalance from './utils/useBalance';
 import useGasPrice from './utils/useGasPrice';
 import { trackErrorAsAnalytics } from '../../../util/analyticsV2';
 import { decodeApproveData, getTicker } from '../../../util/transactions';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 import { swapsTokensSelector } from '../../../reducers/swaps';
 
 const POLLING_INTERVAL = AppConstants.SWAPS.POLLING_INTERVAL;
@@ -294,8 +294,8 @@ function SwapsQuotesView({
 	);
 
 	/* Get tokens from the tokens list */
-	const sourceToken = swapsTokens?.find(token => toLowerCaseCompare(token.address, sourceTokenAddress));
-	const destinationToken = swapsTokens?.find(token => toLowerCaseCompare(token.address, destinationTokenAddress));
+	const sourceToken = swapsTokens?.find(token => toLowerCaseEquals(token.address, sourceTokenAddress));
+	const destinationToken = swapsTokens?.find(token => toLowerCaseEquals(token.address, destinationTokenAddress));
 
 	const hasConversionRate =
 		Boolean(destinationToken) &&

diff --git a/app/components/UI/Swaps/index.js b/app/components/UI/Swaps/index.js
@@ -49,7 +49,7 @@ import SlippageModal from './components/SlippageModal';
 import useBalance from './utils/useBalance';
 import useBlockExplorer from './utils/useBlockExplorer';
 import InfoModal from './components/InfoModal';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	screen: {
@@ -161,11 +161,11 @@ function SwapsAmountView({
 	const [isInitialLoadingTokens, setInitialLoadingTokens] = useState(false);
 	const [, setLoadingTokens] = useState(false);
 	const [isSourceSet, setIsSourceSet] = useState(() =>
-		Boolean(swapsTokens?.find(token => toLowerCaseCompare(token.address, initialSource)))
+		Boolean(swapsTokens?.find(token => toLowerCaseEquals(token.address, initialSource)))
 	);
 
 	const [sourceToken, setSourceToken] = useState(() =>
-		swapsTokens?.find(token => toLowerCaseCompare(token.address, initialSource))
+		swapsTokens?.find(token => toLowerCaseEquals(token.address, initialSource))
 	);
 	const [destinationToken, setDestinationToken] = useState(null);
 	const [hasDismissedTokenAlert, setHasDismissedTokenAlert] = useState(true);
@@ -192,7 +192,7 @@ function SwapsAmountView({
 					InteractionManager.runAfterInteractions(() => {
 						const parameters = {
 							source: initialSource === SWAPS_NATIVE_ADDRESS ? 'MainView' : 'TokenView',
-							activeCurrency: swapsTokens?.find(token => toLowerCaseCompare(token.address, initialSource))
+							activeCurrency: swapsTokens?.find(token => toLowerCaseEquals(token.address, initialSource))
 								?.symbol,
 							chain_id: chainId
 						};
@@ -248,7 +248,7 @@ function SwapsAmountView({
 	useEffect(() => {
 		if (!isSourceSet && initialSource && swapsTokens && !sourceToken) {
 			setIsSourceSet(true);
-			setSourceToken(swapsTokens.find(token => toLowerCaseCompare(token.address, initialSource)));
+			setSourceToken(swapsTokens.find(token => toLowerCaseEquals(token.address, initialSource)));
 		}
 	}, [initialSource, isSourceSet, sourceToken, swapsTokens]);
 

diff --git a/app/components/UI/TransactionEditor/index.js b/app/components/UI/TransactionEditor/index.js
@@ -18,7 +18,7 @@ import contractMap from '@metamask/contract-metadata';
 import { safeToChecksumAddress } from '../../../util/address';
 import TransactionTypes from '../../../core/TransactionTypes';
 import { MAINNET } from '../../../constants/network';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const EDIT = 'edit';
 const REVIEW = 'review';
@@ -381,7 +381,7 @@ class TransactionEditor extends PureComponent {
 		const { selectedAddress } = this.props;
 		try {
 			const owner = await AssetsContractController.getOwnerOf(address, tokenId);
-			const isOwner = toLowerCaseCompare(owner, selectedAddress);
+			const isOwner = toLowerCaseEquals(owner, selectedAddress);
 			if (!isOwner) {
 				return strings('transaction.invalid_collectible_ownership');
 			}

diff --git a/app/components/UI/TransactionElement/utils.js b/app/components/UI/TransactionElement/utils.js
@@ -25,7 +25,7 @@ import contractMap from '@metamask/contract-metadata';
 import { toChecksumAddress } from 'ethereumjs-util';
 import { swapsUtils } from '@metamask/swaps-controller';
 import { isSwapsNativeAsset } from '../Swaps/utils';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const { getSwapsContractAddress } = swapsUtils;
 
@@ -139,7 +139,7 @@ function getCollectibleTransfer(args) {
 	let actionKey;
 	const [, tokenId] = decodeTransferData('transfer', data);
 	const ticker = getTicker(args.ticker);
-	const collectible = collectibleContracts.find(collectible => toLowerCaseCompare(collectible.address, to));
+	const collectible = collectibleContracts.find(collectible => toLowerCaseEquals(collectible.address, to));
 	if (collectible) {
 		actionKey = `${strings('transactions.sent')} ${collectible.name}`;
 	} else {
@@ -335,7 +335,7 @@ function decodeTransferFromTx(args) {
 		selectedAddress
 	} = args;
 	const [addressFrom, addressTo, tokenId] = decodeTransferData('transferFrom', data);
-	const collectible = collectibleContracts.find(collectible => toLowerCaseCompare(collectible.address, to));
+	const collectible = collectibleContracts.find(collectible => toLowerCaseEquals(collectible.address, to));
 	let actionKey = args.actionKey;
 	if (collectible) {
 		actionKey = `${strings('transactions.sent')} ${collectible.name}`;

diff --git a/app/components/Views/Asset/index.js b/app/components/Views/Asset/index.js
@@ -11,7 +11,7 @@ import { getNetworkNavbarOptions } from '../../UI/Navbar';
 import Engine from '../../../core/Engine';
 import { safeToChecksumAddress } from '../../../util/address';
 import { addAccountTimeFlagFilter } from '../../../util/transactions';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -146,7 +146,7 @@ class Asset extends PureComponent {
 		) {
 			if (isTransfer)
 				return this.props.tokens.find(({ address }) =>
-					toLowerCaseCompare(address, transferInformation.contractAddress)
+					toLowerCaseEquals(address, transferInformation.contractAddress)
 				);
 			return true;
 		}

diff --git a/app/components/Views/Collectible/index.js b/app/components/Views/Collectible/index.js
@@ -10,7 +10,7 @@ import Engine from '../../../core/Engine';
 import Modal from 'react-native-modal';
 import CollectibleContractInformation from '../../UI/CollectibleContractInformation';
 import { toggleCollectibleContractModal } from '../../../actions/modals';
-import { toLowerCaseCompare } from '../../../util/general';
+import { toLowerCaseEquals } from '../../../util/general';
 
 const styles = StyleSheet.create({
 	wrapper: {
@@ -76,7 +76,7 @@ class Collectible extends PureComponent {
 		const address = params.address;
 		const { collectibles } = this.props;
 		const filteredCollectibles = collectibles.filter(collectible =>
-			toLowerCaseCompare(collectible.address, address)
+			toLowerCaseEquals(collectible.address, address)
 		);
 		filteredCollectibles.map(collectible => {
 			if (!collectible.name || collectible.name === '') {

diff --git a/app/components/Views/Login/index.js b/app/components/Views/Login/index.js
@@ -44,7 +44,7 @@ import ErrorBoundary from '../ErrorBoundary';
 import WarningExistingUserModal from '../../UI/WarningExistingUserModal';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import { trackErrorAsAnalytics } from '../../../util/analyticsV2';
-import { tlc, toLowerCaseCompare } from '../../../util/general';
+import { tlc, toLowerCaseEquals } from '../../../util/general';
 
 const isTextDelete = text => tlc(text) === 'delete';
 const deviceHeight = Device.getDeviceHeight();
@@ -314,8 +314,8 @@ class Login extends PureComponent {
 			// Should we force people to enable passcode / biometrics?
 			const error = e.toString();
 			if (
-				toLowerCaseCompare(error, WRONG_PASSWORD_ERROR) ||
-				toLowerCaseCompare(error, WRONG_PASSWORD_ERROR_ANDROID)
+				toLowerCaseEquals(error, WRONG_PASSWORD_ERROR) ||
+				toLowerCaseEquals(error, WRONG_PASSWORD_ERROR_ANDROID)
 			) {
 				this.setState({ loading: false, error: strings('login.invalid_password') });
 
@@ -328,7 +328,7 @@ class Login extends PureComponent {
 					'In order to proceed, you need to turn Passcode on or any biometrics authentication method supported in your device (FaceID, TouchID or Fingerprint)'
 				);
 				this.setState({ loading: false });
-			} else if (toLowerCaseCompare(error, VAULT_ERROR)) {
+			} else if (toLowerCaseEquals(error, VAULT_ERROR)) {
 				this.setState({
 					loading: false,
 					error: CLEAN_VAULT_ERROR

diff --git a/app/components/Views/SendFlow/AddressList/index.js b/app/components/Views/SendFlow/AddressList/index.js
@@ -12,6 +12,8 @@ import {
 	TRANSFER_FUNCTION_SIGNATURE,
 	TRANSFER_FROM_FUNCTION_SIGNATURE
 } from '../../../../util/transactions';
+import { swapsUtils } from '@metamask/swaps-controller';
+import { toLowerCaseEquals } from '../../../../util/general';
 
 const styles = StyleSheet.create({
 	root: {
@@ -97,7 +99,11 @@ class AddressList extends PureComponent {
 		 * Whether it only has to render address book
 		 */
 		onlyRenderAddressBook: PropTypes.bool,
-		reloadAddressList: PropTypes.bool
+		reloadAddressList: PropTypes.bool,
+		/**
+		 * Chain id
+		 */
+		chainId: PropTypes.string
 	};
 
 	state = {
@@ -153,7 +159,7 @@ class AddressList extends PureComponent {
 	};
 
 	getRecentAddresses = inputSearch => {
-		const { transactions, network, identities, onAccountPress, onAccountLongPress } = this.props;
+		const { transactions, network, identities, onAccountPress, onAccountLongPress, chainId } = this.props;
 		const recents = [];
 		const parsedRecents = [];
 		if (!inputSearch) {
@@ -171,7 +177,12 @@ class AddressList extends PureComponent {
 				}
 				const checksummedTo = safeToChecksumAddress(to);
 				if (recents.length > 2) return;
-				if (!recents.includes(checksummedTo) && !Object.keys(identities).includes(checksummedTo)) {
+				const swapsContractAddress = swapsUtils.getSwapsContractAddress(chainId);
+				if (
+					!recents.includes(checksummedTo) &&
+					!Object.keys(identities).includes(checksummedTo) &&
+					!toLowerCaseEquals(checksummedTo, swapsContractAddress)
+				) {
 					recents.push(checksummedTo);
 					if (this.networkAddressBook[checksummedTo]) {
 						parsedRecents.push(
@@ -297,7 +308,8 @@ const mapStateToProps = state => ({
 	addressBook: state.engine.backgroundState.AddressBookController.addressBook,
 	identities: state.engine.backgroundState.PreferencesController.identities,
 	network: state.engine.backgroundState.NetworkController.network,
-	transactions: state.engine.backgroundState.TransactionController.transactions
+	transactions: state.engine.backgroundState.TransactionController.transactions,
+	chainId: state.engine.backgroundState.NetworkController.provider.chainId
 });
 
 export default connect(mapStateToProps)(AddressList);
diff --git a/app/components/Views/SendFlow/AddressList/index.test.js b/app/components/Views/SendFlow/AddressList/index.test.js
@@ -10,7 +10,10 @@ describe('AddressList', () => {
 			engine: {
 				backgroundState: {
 					NetworkController: {
-						network: '1'
+						network: '1',
+						provider: {
+							chainId: '1'
+						}
 					},
 					AddressBookController: {
 						addressBook: {

diff --git a/app/components/Views/SendFlow/Amount/index.js b/app/components/Views/SendFlow/Amount/index.js
@@ -54,7 +54,7 @@ import { ANALYTICS_EVENT_OPTS } from '../../../../util/analytics';
 import dismissKeyboard from 'react-native/Libraries/Utilities/dismissKeyboard';
 import NetworkMainAssetLogo from '../../../UI/NetworkMainAssetLogo';
 import { isMainNet } from '../../../../util/networks';
-import { toLowerCaseCompare } from '../../../../util/general';
+import { toLowerCaseEquals } from '../../../../util/general';
 
 const { hexToBN, BNToHex } = util;
 
@@ -425,7 +425,7 @@ class Amount extends PureComponent {
 		} = this.props;
 		try {
 			const owner = await AssetsContractController.getOwnerOf(address, tokenId);
-			const isOwner = toLowerCaseCompare(owner, selectedAddress);
+			const isOwner = toLowerCaseEquals(owner, selectedAddress);
 			if (!isOwner) {
 				return strings('transaction.invalid_collectible_ownership');
 			}