From 18ac6fd82d7a3827bd5b8c4d4d2572d0f8617dce Mon Sep 17 00:00:00 2001
From: "hack.ily" <neil.wang@alumni.unc.edu>
Date: Tue, 29 Oct 2019 23:07:30 -0700
Subject: [PATCH] feat(wallet): Close buttons on send/address pages to go back
 to wallet

---
 src/ui/component/walletAddress/index.js | 11 +++++++----
 src/ui/component/walletAddress/view.jsx | 11 +++++++++--
 src/ui/component/walletSend/index.js    | 11 +++++++----
 src/ui/component/walletSend/view.jsx    | 11 +++++++++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/ui/component/walletAddress/index.js b/src/ui/component/walletAddress/index.js
index 87b98aaee..13cdafd47 100644
--- a/src/ui/component/walletAddress/index.js
+++ b/src/ui/component/walletAddress/index.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import { doCheckAddressIsMine, doGetNewAddress, selectReceiveAddress, selectGettingNewAddress } from 'lbry-redux';
 import WalletAddress from './view';
+import { withRouter } from 'react-router';
 
 const select = state => ({
   receiveAddress: selectReceiveAddress(state),
@@ -12,7 +13,9 @@ const perform = dispatch => ({
   getNewAddress: () => dispatch(doGetNewAddress()),
 });
 
-export default connect(
-  select,
-  perform
-)(WalletAddress);
+export default withRouter(
+  connect(
+    select,
+    perform
+  )(WalletAddress)
+);
diff --git a/src/ui/component/walletAddress/view.jsx b/src/ui/component/walletAddress/view.jsx
index 01c4cd091..64fe797da 100644
--- a/src/ui/component/walletAddress/view.jsx
+++ b/src/ui/component/walletAddress/view.jsx
@@ -1,5 +1,6 @@
 // @flow
 import React from 'react';
+import { REMOVE } from 'constants/icons';
 import Button from 'component/button';
 import CopyableText from 'component/copyableText';
 import QRCode from 'component/common/qr-code';
@@ -10,6 +11,7 @@ type Props = {
   receiveAddress: string,
   getNewAddress: () => void,
   gettingNewAddress: boolean,
+  history: { goBack: () => void },
 };
 
 type State = {
@@ -43,12 +45,17 @@ class WalletAddress extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { receiveAddress, getNewAddress, gettingNewAddress } = this.props;
+    const { receiveAddress, getNewAddress, gettingNewAddress, history } = this.props;
     const { showQR } = this.state;
 
     return (
       <Card
-        title={__('Receive Credits')}
+        title={
+          <React.Fragment>
+            {__('Receive Credits')}
+            <Button button="close" icon={REMOVE} onClick={() => history.goBack()} />
+          </React.Fragment>
+        }
         subtitle={__('Use this address to receive LBC.')}
         actions={
           <React.Fragment>
diff --git a/src/ui/component/walletSend/index.js b/src/ui/component/walletSend/index.js
index 32fa97c42..5268337c5 100644
--- a/src/ui/component/walletSend/index.js
+++ b/src/ui/component/walletSend/index.js
@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 import { selectBalance } from 'lbry-redux';
 import { doOpenModal } from 'redux/actions/app';
 import WalletSend from './view';
+import { withRouter } from 'react-router';
 
 const perform = dispatch => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
@@ -11,7 +12,9 @@ const select = state => ({
   balance: selectBalance(state),
 });
 
-export default connect(
-  select,
-  perform
-)(WalletSend);
+export default withRouter(
+  connect(
+    select,
+    perform
+  )(WalletSend)
+);
diff --git a/src/ui/component/walletSend/view.jsx b/src/ui/component/walletSend/view.jsx
index caa8e27a5..54f5e5189 100644
--- a/src/ui/component/walletSend/view.jsx
+++ b/src/ui/component/walletSend/view.jsx
@@ -1,5 +1,6 @@
 // @flow
 import * as MODALS from 'constants/modal_types';
+import { REMOVE } from 'constants/icons';
 import React from 'react';
 import Button from 'component/button';
 import { Form, FormField } from 'component/common/form';
@@ -15,6 +16,7 @@ type DraftTransaction = {
 type Props = {
   openModal: (id: string, { address: string, amount: number }) => void,
   balance: number,
+  history: { goBack: () => void },
 };
 
 class WalletSend extends React.PureComponent<Props> {
@@ -34,11 +36,16 @@ class WalletSend extends React.PureComponent<Props> {
   }
 
   render() {
-    const { balance } = this.props;
+    const { balance, history } = this.props;
 
     return (
       <Card
-        title={__('Send Credits')}
+        title={
+          <React.Fragment>
+            {__('Send Credits')}
+            <Button button="close" icon={REMOVE} onClick={() => history.goBack()} />
+          </React.Fragment>
+        }
         subtitle={__('Send LBC to your friends or favorite creators.')}
         actions={
           <Formik