diff --git a/app/components/AccountInput/index.js b/app/components/AccountInput/index.js index 15f14a393a5..5357ea336b7 100644 --- a/app/components/AccountInput/index.js +++ b/app/components/AccountInput/index.js @@ -104,6 +104,10 @@ class AccountInput extends Component { * Callback triggered when the input is focused */ onFocus: PropTypes.func, + /** + * Callback triggered when the input is blurred + */ + onBlur: PropTypes.func, /** * Placeholder text to show inside this input */ @@ -127,6 +131,11 @@ class AccountInput extends Component { onFocus && onFocus(); }; + onBlur = () => { + const { onBlur, value } = this.props; + onBlur && onBlur(value); + }; + selectAccount(account) { this.onChange(account.address); } @@ -198,6 +207,7 @@ class AccountInput extends Component { spellCheck={false} style={styles.input} value={value} + onBlur={this.onBlur} /> diff --git a/app/components/AssetIcon/__snapshots__/index.test.js.snap b/app/components/AssetIcon/__snapshots__/index.test.js.snap index 915b5c862a6..68ea1a428aa 100644 --- a/app/components/AssetIcon/__snapshots__/index.test.js.snap +++ b/app/components/AssetIcon/__snapshots__/index.test.js.snap @@ -2,6 +2,12 @@ exports[`AssetIcon should render correctly 1`] = ` : null; + + return logo ? ( + + ) : null; }; } diff --git a/app/components/CollectibleImage/__snapshots__/index.test.js.snap b/app/components/CollectibleImage/__snapshots__/index.test.js.snap index 6b3971a0d91..98434898928 100644 --- a/app/components/CollectibleImage/__snapshots__/index.test.js.snap +++ b/app/components/CollectibleImage/__snapshots__/index.test.js.snap @@ -15,6 +15,12 @@ exports[`CollectibleImage should render correctly 1`] = ` } > {image && image.length !== 0 ? ( diff --git a/app/components/Identicon/index.js b/app/components/Identicon/index.js index 8ed5feb9d55..47439a2281f 100644 --- a/app/components/Identicon/index.js +++ b/app/components/Identicon/index.js @@ -2,6 +2,8 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Image } from 'react-native'; import { toDataUrl } from '../../util/blockies.js'; +import FadeIn from 'react-native-fade-in-image'; +import { colors } from '../../styles/common.js'; /** * UI component that renders an Identicon @@ -36,17 +38,19 @@ export default class IdenticonComponent extends Component { const { diameter, address, customStyle } = this.props; return address ? ( - + + + ) : null; }; } diff --git a/app/components/NetworkList/index.js b/app/components/NetworkList/index.js index 5f4a834028d..ae15a4790cd 100644 --- a/app/components/NetworkList/index.js +++ b/app/components/NetworkList/index.js @@ -148,7 +148,15 @@ export class NetworkList extends Component { NetworkController.setProviderType(type); setTimeout(() => { this.props.onClose(false); - InteractionManager.runAfterInteractions(() => Engine.refreshTransactionHistory()); + InteractionManager.runAfterInteractions(() => { + const { AssetsDetectionController, AccountTrackerController } = Engine.context; + const actions = [ + AssetsDetectionController.detectAssets(), + AccountTrackerController.refresh(), + Engine.refreshTransactionHistory() + ]; + Promise.all(actions); + }); }, 300); }; diff --git a/app/components/Tokens/index.js b/app/components/Tokens/index.js index 9da4fe49d7e..1a46f36816f 100644 --- a/app/components/Tokens/index.js +++ b/app/components/Tokens/index.js @@ -10,6 +10,7 @@ import ActionSheet from 'react-native-actionsheet'; import { renderFromTokenMinimalUnit, balanceToFiat } from '../../util/number'; import Engine from '../../core/Engine'; import AssetElement from '../AssetElement'; +import FadeIn from 'react-native-fade-in-image'; const styles = StyleSheet.create({ wrapper: { @@ -154,7 +155,9 @@ export default class Tokens extends PureComponent { return ( {item.symbol === 'ETH' ? ( - + + + ) : ( )} diff --git a/app/components/TransactionEdit/__snapshots__/index.test.js.snap b/app/components/TransactionEdit/__snapshots__/index.test.js.snap index 67620640048..283b4f0ec39 100644 --- a/app/components/TransactionEdit/__snapshots__/index.test.js.snap +++ b/app/components/TransactionEdit/__snapshots__/index.test.js.snap @@ -183,6 +183,7 @@ exports[`TransactionEdit should render correctly 1`] = ` {!renderIconUrlError && ( - + diff --git a/index.js b/index.js index de838707979..5ffeed381db 100644 --- a/index.js +++ b/index.js @@ -11,6 +11,7 @@ useScreens(); // List of warnings that we're ignoring YellowBox.ignoreWarnings([ + 'Function components cannot be given refs.', 'Task orphaned for request', 'Module RNOS requires', 'use RCT_EXPORT_MODULE', diff --git a/package-lock.json b/package-lock.json index b2031e0541c..9817189131d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12884,9 +12884,8 @@ } }, "react-native-remote-svg": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/react-native-remote-svg/-/react-native-remote-svg-1.4.0.tgz", - "integrity": "sha512-cmmYJHVR4KDYVUpngdxgxWHUK09UTBtMmFs0N8jt1Wdhrq0ptQJJjgYeuSFYntJjl8gxXzmZm8e82P20ohKcaA==" + "version": "github:brunobar79/react-native-remote-svg#a615eae98a65b64a9cde075e382ac2f900f0099c", + "from": "github:brunobar79/react-native-remote-svg#master" }, "react-native-safe-area-view": { "version": "0.11.0", diff --git a/package.json b/package.json index 75a63eaea71..6b9d3cd6f74 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "react-native-progress": "^3.5.0", "react-native-qrcode-svg": "^5.1.1", "react-native-randombytes": "^3.5.0", - "react-native-remote-svg": "^1.4.0", + "react-native-remote-svg": "github:brunobar79/react-native-remote-svg#92ebf7d079a6174e4451a47d372fe2335308c65e", "react-native-screens": "^1.0.0-alpha.21", "react-native-scrollable-tab-view": "github:estebanmino/react-native-scrollable-tab-view#master", "react-native-settings-list": "^1.8.0",