Merge pull request #252 from rainbow-me/@jin/send-remove-redux

Remove SendComponentWithData and send redux
rainbow-me · Dec 3, 2019 · c7c3403 · c7c3403
2 parents c11eda2 + a7700ae
commit c7c3403
Show file tree

Hide file tree

Showing 10 changed files with 435 additions and 792 deletions.
diff --git a/src/components/SendComponentWithData.js b/src/components/SendComponentWithData.js
diff --git a/src/components/fields/AddressField.js b/src/components/fields/AddressField.js
@@ -49,8 +49,9 @@ export default withNavigation(
         this.inputRef.focus()
       );
     }
+
     shouldComponentUpdate(nextProps, nextState) {
-      const isNewAddress = isNewValueForPath(this.props, this.state, 'address');
+      const isNewAddress = isNewValueForPath(nextProps, this.state, 'address');
       const isNewInputValue = isNewValueForPath(
         this.state,
         nextState,

diff --git a/src/components/send/SendAssetForm.js b/src/components/send/SendAssetForm.js
@@ -39,6 +39,7 @@ const SendAssetForm = ({
   buttonRenderer,
   onResetAssetSelection,
   selected,
+  sendMaxBalance,
   txSpeedRenderer,
   ...props
 }) => {
@@ -69,7 +70,11 @@ const SendAssetForm = ({
         {selected.isNft ? (
           <SendAssetFormCollectible {...selected} />
         ) : (
-          <SendAssetFormToken {...props} selected={selected} />
+          <SendAssetFormToken
+            {...props}
+            sendMaxBalance={sendMaxBalance}
+            selected={selected}
+          />
         )}
         <ColumnWithMargins
           flex={0}

diff --git a/src/hoc/withDataInit.js b/src/hoc/withDataInit.js
@@ -84,6 +84,7 @@ export default Component =>
       },
       clearAccountData: ownProps => async () => {
         web3ListenerClearState();
+        gasClearState();
         const p0 = ownProps.explorerClearState();
         const p1 = ownProps.dataClearState();
         const p2 = ownProps.clearIsWalletEmpty();
@@ -93,7 +94,6 @@ export default Component =>
         const p6 = ownProps.nonceClearState();
         const p7 = ownProps.requestsClearState();
         const p8 = ownProps.uniswapClearState();
-        const p9 = ownProps.gasClearState();
         return promiseUtils.PromiseAllWithFails([
           p0,
           p1,
@@ -104,7 +104,6 @@ export default Component =>
           p6,
           p7,
           p8,
-          p9,
         ]);
       },
       initializeAccountData: ownProps => async () => {

diff --git a/src/redux/gas.js b/src/redux/gas.js
@@ -177,9 +177,7 @@ const getSelectedGasPrice = (
   };
 };
 
-export const gasClearState = () => () => {
-  clearInterval(getGasPricesInterval);
-};
+export const gasClearState = () => clearInterval(getGasPricesInterval);
 
 // -- Reducer --------------------------------------------------------------- //
 const INITIAL_STATE = {

diff --git a/src/redux/reducers.js b/src/redux/reducers.js
@@ -16,7 +16,6 @@ import openStateSettings from './openStateSettings';
 import requests from './requests';
 import selectedInput from './selectedInput';
 import selectedWithFab from './selectedWithFab';
-import send from './send';
 import settings from './settings';
 import uniqueTokens from './uniqueTokens';
 import uniswap from './uniswap';
@@ -39,7 +38,6 @@ export default combineReducers({
   requests,
   selectedInput,
   selectedWithFab,
-  send,
   settings,
   uniqueTokens,
   uniswap,