Fix: Add tokens android crash (#1127)

* bump react-native-remote-svg * fix add tokens crash
MetaMask · Oct 2, 2019 · 7fb7c9b · 7fb7c9b
1 parent 6ba7a25
commit 7fb7c9b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/app/components/UI/AddCustomToken/index.js b/app/components/UI/AddCustomToken/index.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Text, TextInput, View, StyleSheet } from 'react-native';
+import { Text, TextInput, View, StyleSheet, InteractionManager } from 'react-native';
 import { colors, fontStyles } from '../../../styles/common';
 import Engine from '../../../core/Engine';
 import PropTypes from 'prop-types';
@@ -54,8 +54,23 @@ export default class AddCustomToken extends PureComponent {
 		if (!(await this.validateCustomToken())) return;
 		const { AssetsController } = Engine.context;
 		const { address, symbol, decimals } = this.state;
-		AssetsController.addToken(address, symbol, decimals);
-		this.props.navigation.goBack();
+		await AssetsController.addToken(address, symbol, decimals);
+		// Clear state before closing
+		this.setState(
+			{
+				address: '',
+				symbol: '',
+				decimals: '',
+				warningAddress: '',
+				warningSymbol: '',
+				warningDecimals: ''
+			},
+			() => {
+				InteractionManager.runAfterInteractions(() => {
+					this.props.navigation.goBack();
+				});
+			}
+		);
 	};
 
 	cancelAddToken = () => {

diff --git a/app/components/UI/SearchTokenAutocomplete/index.js b/app/components/UI/SearchTokenAutocomplete/index.js
@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, InteractionManager } from 'react-native';
 import { colors } from '../../../styles/common';
 import PropTypes from 'prop-types';
 import { strings } from '../../../../locales/i18n';
@@ -44,11 +44,23 @@ export default class SearchTokenAutocomplete extends PureComponent {
 		this.setState({ selectedAsset: asset });
 	};
 
-	addToken = () => {
+	addToken = async () => {
 		const { AssetsController } = Engine.context;
 		const { address, symbol, decimals } = this.state.selectedAsset;
-		AssetsController.addToken(address, symbol, decimals);
-		this.props.navigation.goBack();
+		await AssetsController.addToken(address, symbol, decimals);
+		// Clear state before closing
+		this.setState(
+			{
+				searchResults: [],
+				searchQuery: '',
+				selectedAsset: {}
+			},
+			() => {
+				InteractionManager.runAfterInteractions(() => {
+					this.props.navigation.goBack();
+				});
+			}
+		);
 	};
 
 	render = () => {

diff --git a/package.json b/package.json
@@ -119,7 +119,7 @@
     "react-native-push-notification": "git+ssh://[email protected]/brunobar79/react-native-push-notification.git#androidx",
     "react-native-qrcode-svg": "5.1.2",
     "react-native-randombytes": "3.5.2",
-    "react-native-remote-svg": "git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#cc0ba8b1a0bd8fc73e10b3078751e362ddcb3aee",
+    "react-native-remote-svg": "git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#6f071a1cefe25e9a9d56570a74523741bae65a8b",
     "react-native-screens": "1.0.0-alpha.23",
     "react-native-scrollable-tab-view": "git+ssh://[email protected]/estebanmino/react-native-scrollable-tab-view.git#f954274c6260a07c956e2185c611aed24b2f1526",
     "react-native-search-api": "1.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -9039,9 +9039,9 @@ [email protected]:
     buffer "^4.9.1"
     sjcl "^1.0.3"
 
-"react-native-remote-svg@git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#cc0ba8b1a0bd8fc73e10b3078751e362ddcb3aee":
+"react-native-remote-svg@git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#6f071a1cefe25e9a9d56570a74523741bae65a8b":
   version "2.0.6"
-  resolved "git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#cc0ba8b1a0bd8fc73e10b3078751e362ddcb3aee"
+  resolved "git+ssh://[email protected]/brunobar79/react-native-remote-svg.git#6f071a1cefe25e9a9d56570a74523741bae65a8b"
 
 react-native-safe-area-view@^0.14.1:
   version "0.14.7"