Merge pull request #550 from LiskHQ/280-send-launch-protocol

Fix the launch protocol for send - Closes #280
LiskHQ · Mar 13, 2018 · b4d8019 · b4d8019
2 parents 9c9a1d6 + 6b38fd6
commit b4d8019
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/src/components/dashboard/index.js b/src/components/dashboard/index.js
@@ -12,7 +12,7 @@ import styles from './dashboard.css';
 
 class Dashboard extends React.Component {
   render() {
-    const { transactions, t } = this.props;
+    const { transactions, t, history, accountAddress, loading } = this.props;
     return <div className={`${grid.row} ${styles.wrapper}`}>
       <div className={`${grid['col-md-8']} ${grid['col-xs-12']} ${styles.main}`}>
         <Box className={`${styles.graph}`}>
@@ -31,14 +31,14 @@ class Dashboard extends React.Component {
           <TransactionList {...{
             transactions,
             t,
-            address: this.props.accountAddress,
+            address: accountAddress,
             dashboard: true,
-            loading: this.props.loading,
+            loading,
           }} />
         </Box>
       </div>
       <div className={`${grid['col-md-4']} ${styles.sendWrapper}`}>
-        <Send/>
+        <Send history={history} />
       </div>
     </div>;
   }

diff --git a/src/components/dashboard/index.test.js b/src/components/dashboard/index.test.js
@@ -33,7 +33,7 @@ describe('Dashboard', () => {
         account: { address: 'some address' },
       },
     };
-    wrapper = mountWithContext(<Dashboard/>, context);
+    wrapper = mountWithContext(<Dashboard history={ { location: {} } }/>, context);
   });
 
   it('should render transaction list with at most 3 transactions', () => {

diff --git a/src/components/resultBox/resultBox.js b/src/components/resultBox/resultBox.js
@@ -41,7 +41,11 @@ class ResultBox extends React.Component {
 
         <footer>
           <Button className={`okay-button ${styles.okButton}`}
-            onClick={() => { this.props.finalCallback(); this.props.reset(); } }>
+            onClick={() => {
+              this.props.finalCallback();
+              this.props.reset();
+              this.props.history.push(this.props.history.location.pathname);
+            }}>
             {this.props.t('Okay')}
           </Button>
           <div className='subTitle'>{this.props.subTitle}</div>

diff --git a/src/components/resultBox/resultBox.test.js b/src/components/resultBox/resultBox.test.js
@@ -35,6 +35,7 @@ describe('Result Box', () => {
       copyToClipboard: () => {},
       finalCallback: () => {},
       t: () => {},
+      history: { location: {}, push: () => {} },
     };
 
     wrapper = mount(<ResultBox {...props} />, options);

diff --git a/src/components/send/index.js b/src/components/send/index.js
@@ -15,12 +15,15 @@ import styles from './send.css';
 class Send extends React.Component {
   constructor(props) {
     super(props);
-    this.address = parseSearchParams(props.search).address;
     this.state = {
-      sendIsActive: !!this.address,
+      sendIsActive: !!this.getSearchParams().address || !!this.getSearchParams().amount,
     };
   }
 
+  getSearchParams() {
+    return parseSearchParams(this.props.history.location.search);
+  }
+
   setSendIsActive(sendIsActive) {
     this.setState({ sendIsActive });
   }
@@ -44,11 +47,12 @@ class Send extends React.Component {
             className={styles.wrapper}>
             <SendWritable
               autoFocus={this.state.sendIsActive || window.innerWidth > breakpoints.m}
-              address={this.address}
+              address={this.getSearchParams().address}
+              amount={this.getSearchParams().amount}
             />
             <PassphraseSteps />
             <SendReadable />
-            <ResultBox />
+            <ResultBox history={this.props.history}/>
           </MultiStep>
         </Box>
       </Fragment>

diff --git a/src/components/send/index.test.js b/src/components/send/index.test.js
@@ -27,7 +27,7 @@ describe('Send', () => {
     context = {
       storeState,
     };
-    wrapper = mountWithContext(<Send search={''}/>, context);
+    wrapper = mountWithContext(<Send history={ { location: {} } }/>, context);
   });
 
   it('should render MultiStep component ', () => {

diff --git a/src/components/sendWritable/send.js b/src/components/sendWritable/send.js
@@ -17,7 +17,7 @@ class SendWritable extends React.Component {
         value: this.props.address || '',
       },
       amount: {
-        value: '',
+        value: this.props.amount || '',
       },
       ...authStatePrefill(),
     };
@@ -35,7 +35,7 @@ class SendWritable extends React.Component {
           value: this.props.prevState.recipient || this.state.recipient.value,
         },
         amount: {
-          value: this.props.prevState.amount || '',
+          value: this.props.prevState.amount || this.state.amount.value,
         },
         ...authStatePrefill(this.props.account),
       };

diff --git a/src/components/transactionDashboard/index.js b/src/components/transactionDashboard/index.js
@@ -10,7 +10,7 @@ class TransactionsDashboard extends React.Component {
   render() {
     return <div className={`${grid.row} ${styles.wrapper}`}>
       <div className={`${grid['col-md-4']}`}>
-        <Send search={this.props.location.search}/>
+        <Send history={this.props.history} />
       </div>
       <div className={`${grid['col-sm-12']} ${styles.transactions} ${grid['col-md-8']}`}>
         <Transactions {...this.props} />

diff --git a/test/integration/wallet.test.js b/test/integration/wallet.test.js
@@ -117,7 +117,7 @@ describe('@integration: Wallet', () => {
     store.dispatch(activePeerSet({ network: getNetwork(networks.mainnet.code) }));
     accountAPIStub.withArgs(match.any).returnsPromise().resolves({ ...account });
     store.dispatch(accountLoggedIn(account));
-    wrapper = mount(renderWithRouter(Wallet, store, { location: { search: '' } }));
+    wrapper = mount(renderWithRouter(Wallet, store, { history: { location: { search: '' } } }));
     helper = new Helper(wrapper, store);
   };