src/wallet/WalletScreen.js

@@ -52,7 +52,6 @@ export default class WalletScreen extends Component {
   }
 
   componentWillMount() {
-
     if (FeaturesService.has('crypto')) {
       this.disposeEnter = this.props.navigation.addListener('didFocus', async () => {
         if ((await this.props.wallet.canShowOnboarding()) && (!this.props.user.hasRewards() || !this.props.user.hasEthWallet())) {
@@ -74,7 +73,7 @@ export default class WalletScreen extends Component {
       <View style={CommonStyle.flexContainer}>
         <ScrollView style={ styles.mainContainer }
           keyboardShouldPersistTaps='always'>
-          <WalletBalanceTokens />
+          <WalletBalanceTokens navigation={this.props.navigation}/>
           <WalletOverviewView />
           <WalletScoresView />
           <View>

src/wallet/balances/WalletBalanceTokens.js

@@ -23,8 +23,31 @@ export default class WalletBalanceTokens extends Component {
     this.props.wallet.refresh();
   }
 
-  render() {
+  componentWillMount() {
+    this.disposeEnter = this.props.navigation.addListener('didFocus', (s) => {
+      // ignore back navigation
+      if (s.action.type === 'Navigation/NAVIGATE' && s.action.routeName === 'Wallet') {
+        this.triggerRender(this.props.wallet);
+      }
+    });
+  }
+
+  triggerRender(wallet) {
+    wallet.ledger.list.clearList();
+    wallet.refresh(true);
+  }
 
+  /**
+   * On component unmount
+   */
+  componentWillUnmount() {
+    // clear data to free memory
+    this.wallet.ledger.list.clearList();
+    this.disposeEnter.remove();
+  }
+
+  render() {
+    
     let addresses = null;
 
     if (this.props.wallet.addresses) {