Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: fiat deeplinks #648

Merged
merged 5 commits into from
May 14, 2019
Merged

Bugfix: fiat deeplinks #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd3841c
fix button info type color
estebanmino May 14, 2019
783a7c8
fix bug
estebanmino May 14, 2019
d119d46
drop package
estebanmino May 14, 2019
2fa5e7a
Merge branch 'develop' into bugfix/fiat-deeplinks
estebanmino May 14, 2019
256dbf5
Merge branch 'develop' into bugfix/fiat-deeplinks
estebanmino May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/components/UI/EthInput/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -215,7 +216,7 @@ class EthInput extends Component {
},
...this.props.tokens
],
readableValue: transaction.readableValue
readableValue: processedReadableValue
});
break;
case 'ETHER_TRANSACTION':
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/StyledButton/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -203,7 +203,7 @@ exports[`StyledButton should render correctly on iOS the button with type orange
"padding": 15,
},
Object {
"backgroundColor": undefined,
"backgroundColor": "#037dd6",
},
undefined,
]
Expand Down
6 changes: 3 additions & 3 deletions app/components/UI/StyledButton/styledButtonStyles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -73,7 +73,7 @@ const styles = StyleSheet.create({
info: {
backgroundColor: colors.white,
borderWidth: 1,
borderColor: colors.blueFox
borderColor: colors.blue
},
warningText: {
color: colors.red
Expand Down