Bugfix: fiat deeplinks (#648)

* fix button info type color * fix bug * drop package
MetaMask · May 14, 2019 · 0a0087b · 0a0087b
1 parent 32ff52b
commit 0a0087b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/app/components/UI/EthInput/index.js b/app/components/UI/EthInput/index.js
@@ -205,6 +205,7 @@ class EthInput extends Component {
 	 */
 	componentDidMount = () => {
 		const { transaction, collectibles } = this.props;
+		const { processedReadableValue } = this.processValue(transaction.readableValue);
 		switch (transaction.type) {
 			case 'TOKENS_TRANSACTION':
 				this.setState({
@@ -215,7 +216,7 @@ class EthInput extends Component {
 						},
 						...this.props.tokens
 					],
-					readableValue: transaction.readableValue
+					readableValue: processedReadableValue
 				});
 				break;
 			case 'ETHER_TRANSACTION':
@@ -226,28 +227,26 @@ class EthInput extends Component {
 							symbol: 'ETH'
 						}
 					],
-					readableValue: transaction.readableValue
+					readableValue: processedReadableValue
 				});
 				break;
 			case 'INDIVIDUAL_TOKEN_TRANSACTION':
 				this.setState({
 					assets: [transaction.selectedAsset],
-					readableValue: transaction.readableValue
+					readableValue: processedReadableValue
 				});
 				break;
 			case 'INDIVIDUAL_COLLECTIBLE_TRANSACTION':
 				this.setState({
-					assets: [transaction.selectedAsset],
-					readableValue: transaction.readableValue
+					assets: [transaction.selectedAsset]
 				});
 				break;
 			case 'CONTRACT_COLLECTIBLE_TRANSACTION': {
 				const collectiblesToShow = collectibles.filter(
 					collectible => collectible.address.toLowerCase() === transaction.selectedAsset.address.toLowerCase()
 				);
 				this.setState({
-					assets: collectiblesToShow,
-					readableValue: transaction.readableValue
+					assets: collectiblesToShow
 				});
 				break;
 			}

diff --git a/app/components/UI/StyledButton/__snapshots__/index.test.js.snap b/app/components/UI/StyledButton/__snapshots__/index.test.js.snap
@@ -79,7 +79,7 @@ exports[`StyledButton should render correctly on Android the button with type or
           "padding": 15,
         },
         Object {
-          "backgroundColor": undefined,
+          "backgroundColor": "#037dd6",
         },
         null,
         undefined,
@@ -203,7 +203,7 @@ exports[`StyledButton should render correctly on iOS the button with type orange
         "padding": 15,
       },
       Object {
-        "backgroundColor": undefined,
+        "backgroundColor": "#037dd6",
       },
       undefined,
     ]

diff --git a/app/components/UI/StyledButton/styledButtonStyles.js b/app/components/UI/StyledButton/styledButtonStyles.js
@@ -20,13 +20,13 @@ const styles = StyleSheet.create({
 		color: colors.white
 	},
 	orange: {
-		backgroundColor: colors.blueFox
+		backgroundColor: colors.blue
 	},
 	orangeText: {
 		color: colors.white
 	},
 	infoText: {
-		color: colors.blueFox
+		color: colors.blue
 	},
 	confirm: {
 		backgroundColor: colors.blue,
@@ -73,7 +73,7 @@ const styles = StyleSheet.create({
 	info: {
 		backgroundColor: colors.white,
 		borderWidth: 1,
-		borderColor: colors.blueFox
+		borderColor: colors.blue
 	},
 	warningText: {
 		color: colors.red