Closes #236 - navigation fixed from main page token item to coin send

ChainSafe · Sep 30, 2018 · e125739 · e125739
1 parent db96a4a
commit e125739
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/src/screens/main/portfolio/index.js b/src/screens/main/portfolio/index.js
@@ -94,9 +94,11 @@ class Portfolio extends Component {
   renderRow = (token) => {
     return (
         <TouchableOpacity
-          onPress={() => {
-            this.props.addTokenInfo(token);
-            this.props.navigation.navigate('TokenFunctionality');
+          onPress={() => {          
+            const navigateToTransaction = NavigationActions.navigate({
+              routeName: 'TokenFunctionality',
+            });
+            this.props.navigation.dispatch(navigateToTransaction);
           }}
           style={styles.listItemParentContainer}
         >

diff --git a/src/screens/main/tokens/receive/CoinReceive.js b/src/screens/main/tokens/receive/CoinReceive.js
@@ -34,17 +34,17 @@ class CoinReceive extends Component {
       <SafeAreaView style={styles.safeAreaView}>
         <View style={mainContainer}>
           <View style={contentContainer} >
-            <View style={imageContainer}>
+            {/* <View style={imageContainer}>
               <QRCode
-                value={this.props.walletAddress}
+                value={this.props.wallet.address}
                 size={ 225}
                 bgColor='#27c997'
                 fgColor='#fafbfe' />
             </View>
             <View style={addressContainer}>
                 <Text style={addressTitle}>Address: </Text>
-                <Text style={addressValue}>{this.props.walletAddress}</Text>
-            </View>            
+                <Text style={addressValue}>{this.props.wallet.address}</Text>
+            </View>             */}
           </View>
           <View style={footerGrandparentContainer}>
             <View style={footerParentContainer}>
@@ -136,8 +136,18 @@ const styles = StyleSheet.create({
  * create/reterived during the initial process
  * @param {Object} state
  */
-const mapStateToProps = state => ({
-  walletAddress: state.newWallet.wallet.address,
-});
+
+const mapStateToProps = (state) => {
+  console.log('revieve', state.Wallet);
+
+  return {
+    wallet: state,
+  };
+};
+
+// const mapStateToProps = state => ({
+
+//   walletAddress: state.Wallet.wallets[0].hdWallet.address,
+// });
 
 export default connect(mapStateToProps, null)(CoinReceive);
diff --git a/src/screens/main/tokens/send/CoinSend.js b/src/screens/main/tokens/send/CoinSend.js
@@ -435,13 +435,6 @@ const styles = StyleSheet.create({
  * @param {Object} state
  */
 const mapStateToProps = (state) => {
-  // return {
-  //   wallet: state.newWallet.wallet,
-  //   addressData: state.newWallet.QrData,
-  //   token: state.newWallet.current_token,
-  //   txnFee: state.newWallet.txnFee,
-  //   contactAddress: state.contacts.contactDataforCoinSend,
-  // };
   return {
     wallet: state.Wallet.wallets[0].hdWallet,
     addressData: state.Wallet.tokenInfoForTransaction.toAddress, //to address