[send] Fix Send all funds issue (#2822)

decred · Oct 29, 2020 · 106226b · 106226b
1 parent a4dec62
commit 106226b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/app/components/views/TransactionsPage/SendTab/SendOutputRow/SendOutputRow.jsx b/app/components/views/TransactionsPage/SendTab/SendOutputRow/SendOutputRow.jsx
@@ -56,7 +56,7 @@ const getSendAllFundsIcon = ({
       <a className={classNames(
         styles.sendIconWrapper,
         styles.cancelIcon
-      )} onClick={onHideSendAll} s/>
+      )} onClick={onHideSendAll} />
     </Tooltip>
   );
 

diff --git a/app/components/views/TransactionsPage/SendTab/SendTab.jsx b/app/components/views/TransactionsPage/SendTab/SendTab.jsx
@@ -61,7 +61,8 @@ const SendTab = () => {
     onAddOutput,
     onUpdateOutput,
     onRemoveOutput,
-    onSetOutputs
+    onSetOutputs,
+    prevOutputs
   } = useOutputs();
 
   const { walletService } = useService();
@@ -76,6 +77,7 @@ const SendTab = () => {
   const prevPublishTxResponse = usePrevious(publishTxResponse);
   const prevNextAddress = usePrevious(nextAddress);
   const prevIsSendSelf = usePrevious(isSendSelf);
+  const prevAccount = usePrevious(account);
 
   const onValidateAddress = async ({ address, index }) => {
     let error;
@@ -95,7 +97,6 @@ const SendTab = () => {
       }
       ref.data.error.address = error;
       onUpdateOutput(ref);
-      onAttemptConstructTransaction();
     } catch (err) {
       return err;
     }
@@ -120,39 +121,49 @@ const SendTab = () => {
     ref.data.amount = atomValue;
     ref.data.error.amount = error;
     onUpdateOutput(ref);
-    onAttemptConstructTransaction();
   };
 
   const onChangeAccount = (account) => {
     setAccount(account);
-    onAttemptConstructTransaction();
+
+    if (isSendAll) {
+      const newOutputs = [{
+        ...outputs[0],
+        data: {
+          ...outputs[0].data,
+          amount: account.spendable
+        }
+      }];
+      onSetOutputs(newOutputs);
+    }
   };
 
   const onShowSendSelf = () => {
     const newOutputs = [{ ...outputs[0], data: baseOutput().data }];
     setIsSendSelf(true);
     onSetOutputs(newOutputs);
-    onAttemptConstructTransaction();
   };
 
   const onShowSendOthers = () => {
     const newOutputs = [{ ...outputs[0], data: baseOutput().data }];
     setIsSendSelf(false);
     onSetOutputs(newOutputs);
-    onAttemptConstructTransaction();
   };
 
   const onShowSendAll = () => {
     const newOutputs = [{
       ...outputs[0],
       data: {
         ...outputs[0].data,
-        amount: account.spendable
+        amount: account.spendable,
+        error: {
+         ...outputs[0].data.error,
+          amount: null
+        }
       }
     }];
     setIsSendAll(true);
     onSetOutputs(newOutputs);
-    onAttemptConstructTransaction();
   };
 
   const onKeyDown = (e) => {
@@ -171,7 +182,6 @@ const SendTab = () => {
     }];
     setIsSendAll(false);
     onSetOutputs(newOutputs);
-    onAttemptConstructTransaction();
   };
 
   const hasError = useCallback(() => {
@@ -293,15 +303,17 @@ const SendTab = () => {
     }
     if (newOutputs) {
       onSetOutputs(newOutputs);
-      onAttemptConstructTransaction();
     }
+
     if (constructTxLowBalance) {
       setInsuficientFunds(true);
     } else {
       setInsuficientFunds(false);
     }
 
-    return () => onClearTransaction();
+    if(prevOutputs != outputs || prevAccount != account) {
+      onAttemptConstructTransaction();
+    }
   }, [
     publishTxResponse,
     prevPublishTxResponse,
@@ -312,12 +324,19 @@ const SendTab = () => {
     constructTxLowBalance,
     nextAddressAccount.value,
     outputs,
+    prevOutputs,
     onSetOutputs,
     onAttemptConstructTransaction,
     onClearTransaction,
-    onGetNextAddressAttempt
+    onGetNextAddressAttempt,
+    account,
+    prevAccount
   ]);
 
+  useEffect(() => {
+    return () => onClearTransaction;
+  });
+
   return !walletService ? <ErrorScreen /> : (
     <SendPage
       {...{

diff --git a/app/components/views/TransactionsPage/SendTab/hooks.js b/app/components/views/TransactionsPage/SendTab/hooks.js
@@ -3,6 +3,7 @@ import * as sel from "selectors";
 import * as ca from "actions/ControlActions";
 import { baseOutput } from "./helpers";
 import { useSelector, useDispatch } from "react-redux";
+import { usePrevious } from "hooks";
 
 export function useSendTab() {
   const defaultSpendingAccount = useSelector(sel.defaultSpendingAccount);
@@ -58,6 +59,7 @@ export function useSendTab() {
 
 export function useOutputs() {
   const [outputs, setOutputs] = useState([baseOutput()]);
+  const prevOutputs = usePrevious(outputs);
 
   const onAddOutput = () => {
     const newOutputs = [ ...outputs ];
@@ -83,6 +85,7 @@ export function useOutputs() {
     onAddOutput,
     onUpdateOutput,
     onRemoveOutput,
-    onSetOutputs: setOutputs
+    onSetOutputs: setOutputs,
+    prevOutputs
   };
 }