From f2bbcbc1c70c1b7332a01e6465f1194b0892645d Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Tue, 4 Apr 2023 15:41:54 -0700
Subject: [PATCH 1/2] fix: fee and transfer amount values

---
 libs/accounts/src/lib/transfer-form.tsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/libs/accounts/src/lib/transfer-form.tsx b/libs/accounts/src/lib/transfer-form.tsx
index 78e4f4fc4..763578ae2 100644
--- a/libs/accounts/src/lib/transfer-form.tsx
+++ b/libs/accounts/src/lib/transfer-form.tsx
@@ -79,10 +79,13 @@ export const TransferForm = ({
 
   const fee = useMemo(() => {
     if (!transferAmount) return undefined;
+    if (includeFee) {
+      return new BigNumber(amount).minus(transferAmount).toString();
+    }
     return (
       feeFactor && new BigNumber(feeFactor).times(transferAmount).toString()
     );
-  }, [transferAmount, feeFactor]);
+  }, [amount, includeFee, transferAmount, feeFactor]);
 
   const asset = useMemo(() => {
     return assets.find((a) => a.id === assetId);
@@ -254,7 +257,12 @@ export const TransferForm = ({
         />
       </div>
       {transferAmount && fee && (
-        <TransferFee amount={transferAmount} feeFactor={feeFactor} fee={fee} />
+        <TransferFee
+          amount={transferAmount}
+          transferAmount={transferAmount}
+          feeFactor={feeFactor}
+          fee={fee}
+        />
       )}
       <Button type="submit" variant="primary" fill={true}>
         {t('Confirm transfer')}
@@ -265,16 +273,18 @@ export const TransferForm = ({
 
 export const TransferFee = ({
   amount,
+  transferAmount,
   feeFactor,
   fee,
 }: {
   amount: string;
+  transferAmount: string;
   feeFactor: string | null;
   fee?: string;
 }) => {
-  if (!feeFactor || !amount || !fee) return null;
+  if (!feeFactor || !amount || !transferAmount || !fee) return null;
 
-  const totalValue = new BigNumber(amount).plus(fee).toFixed();
+  const totalValue = new BigNumber(transferAmount).plus(fee).toFixed();
 
   return (
     <div className="mb-4 flex flex-col gap-2 text-xs">

From b9e57bda5abf33e74a138c3d46659ae43ee843de Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Tue, 4 Apr 2023 15:43:34 -0700
Subject: [PATCH 2/2] chore: remove unnecessary argument to translate function

---
 libs/accounts/src/lib/transfer-form.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/accounts/src/lib/transfer-form.tsx b/libs/accounts/src/lib/transfer-form.tsx
index 763578ae2..530390ed3 100644
--- a/libs/accounts/src/lib/transfer-form.tsx
+++ b/libs/accounts/src/lib/transfer-form.tsx
@@ -245,8 +245,7 @@ export const TransferForm = ({
           label={
             <Tooltip
               description={t(
-                `The fee will be taken from the amount you are transferring.`,
-                [feeFactor || '-']
+                `The fee will be taken from the amount you are transferring.`
               )}
             >
               <div>{t('Include transfer fee')}</div>