Merge branch 'todayext' into experimental

App.js

@@ -55,7 +55,6 @@ export default class App extends React.Component {
           routeName: 'WalletTransactions',
           params: {
             wallet,
-            headerColor: WalletGradient.headerColorFor(wallet.type),
           },
         }),
       );
@@ -77,7 +76,6 @@ export default class App extends React.Component {
               key: `WalletTransactions-${wallet.getID()}`,
               params: {
                 wallet,
-                headerColor: WalletGradient.headerColorFor(wallet.type),
               },
             }),
           );
@@ -95,7 +93,6 @@ export default class App extends React.Component {
         key: `WalletTransactions-${wallet.getID()}`,
         params: {
           wallet,
-          headerColor: WalletGradient.headerColorFor(wallet.type),
         },
       }),
     );

screen/wallets/list.js

@@ -5,7 +5,6 @@ import { Icon } from 'react-native-elements';
 import { NavigationEvents } from 'react-navigation';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import PropTypes from 'prop-types';
-import WalletGradient from '../../class/walletGradient';
 let EV = require('../../events');
 let A = require('../../analytics');
 /** @type {AppStorage} */
@@ -135,7 +134,7 @@ export default class WalletsList extends Component {
     if (wallet) {
       this.props.navigation.navigate('WalletTransactions', {
         wallet: wallet,
-        headerColor: WalletGradient.headerColorFor(wallet.type),
+        key: `WalletTransactions-${wallet.getID()}`,
       });
     } else {
       // if its out of index - this must be last card with incentive to create wallet

screen/wallets/transactions.js

@@ -26,6 +26,7 @@ import {
   BlueTransactionListItem,
   BlueWalletNavigationHeader,
 } from '../../BlueComponents';
+import WalletGradient from '../../class/walletGradient';
 import { Icon } from 'react-native-elements';
 import { LightningCustodianWallet } from '../../class';
 import Handoff from 'react-native-handoff';
@@ -54,7 +55,7 @@ export default class WalletTransactions extends Component {
         </TouchableOpacity>
       ),
       headerStyle: {
-        backgroundColor: navigation.getParam('headerColor'),
+        backgroundColor: WalletGradient.headerColorFor(navigation.state.params.wallet.type),
         borderBottomWidth: 0,
         elevation: 0,
         shadowRadius: 0,
@@ -354,7 +355,9 @@ export default class WalletTransactions extends Component {
   };
 
   onWalletSelect = async wallet => {
-    NavigationService.navigate('WalletTransactions');
+    NavigationService.navigate('WalletTransactions', {
+      key: `WalletTransactions-${wallet.getID()}`,
+    });
     /** @type {LightningCustodianWallet} */
     let toAddress = false;
     if (this.state.wallet.refill_addressess.length > 0) {