Merge pull request #241 from Plex-Engineer/lp-allowance-fix

add allowance completion check
Plex-Engineer · Apr 27, 2023 · e9f7c67 · e9f7c67
2 parents a59a73d + b4a14f8
commit e9f7c67
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/src/pages/dexLP/modals/addModal.tsx b/src/pages/dexLP/modals/addModal.tsx
@@ -66,7 +66,9 @@ const AddAllowanceButton = (props: AddAllowanceProps) => {
   useEffect(() => {
     if (
       props.pair.allowance.token1.lt(props.pair.balances.token1) ||
-      props.pair.allowance.token2.lt(props.pair.balances.token2)
+      props.pair.allowance.token2.lt(props.pair.balances.token2) ||
+      props.pair.allowance.token1.isZero() ||
+      props.pair.allowance.token2.isZero()
     ) {
       setModalType(ModalType.ENABLE);
     }

diff --git a/src/pages/dexLP/modals/enableModal.tsx b/src/pages/dexLP/modals/enableModal.tsx
@@ -25,7 +25,10 @@ const AddSingleAllowanceButton = (props: AddSingleAllowanceProps) => {
 
   return (
     <PrimaryButton
-      disabled={props.tokenAllowance.gte(props.tokenBalance)}
+      disabled={
+        props.tokenAllowance.gte(props.tokenBalance) &&
+        !props.tokenAllowance.isZero()
+      }
       onClick={() =>
         props.addAllowance(
           routerAddress,
@@ -81,22 +84,40 @@ const EnableModal = ({ activePair, chainId, setModal }: Props) => {
 
   const prevModalType = useModals((state) => state.prevModalType);
 
+  function doneAllowance(
+    allowance: BigNumber,
+    balance: BigNumber,
+    status: TransactionState
+  ) {
+    return (
+      (allowance.gte(balance) && !allowance.isZero()) || status == "Success"
+    );
+  }
+
   //bring us to the next modal if we are done enabling
   useEffect(() => {
     if (prevModalType == ModalType.ADD) {
-      const doneAllowance1 =
-        activePair.allowance.token1.gt(activePair.balances.token1) ||
-        addAllowanceA.status == "Success";
-      const doneAllowance2 =
-        activePair.allowance.token2.gt(activePair.balances.token2) ||
-        addAllowanceB.status == "Success";
-      if (doneAllowance1 && doneAllowance2) {
+      if (
+        doneAllowance(
+          activePair.allowance.token1,
+          activePair.balances.token1,
+          addAllowanceA.status
+        ) &&
+        doneAllowance(
+          activePair.allowance.token2,
+          activePair.balances.token2,
+          addAllowanceB.status
+        )
+      ) {
         setModal(ModalType.NONE);
       }
     } else if (
       prevModalType == ModalType.REMOVE &&
-      (activePair.allowance.LPtoken.gt(activePair.userSupply.totalLP) ||
-        addLPAllowance.status == "Success")
+      doneAllowance(
+        activePair.allowance.LPtoken,
+        activePair.userSupply.totalLP,
+        addLPAllowance.status
+      )
     ) {
       setModal(ModalType.NONE);
     }