fix(Swap): close short approvals fixed

primitivefinance · Mar 22, 2021 · c8efd34 · c8efd34
1 parent bea33d7
commit c8efd34
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 82 deletions.
diff --git a/src/components/Market/OrderCard/components/Swap/Swap.tsx b/src/components/Market/OrderCard/components/Swap/Swap.tsx
@@ -124,7 +124,6 @@ const Swap: React.FC = () => {
         )
   }, [orderType, entity.isPut, item.market, scaleUp, scaleDown])
   useEffect(() => {
-    console.log(getSpotPremiums())
     setPrem(getSpotPremiums())
   }, [orderType])
 
@@ -427,7 +426,10 @@ const Swap: React.FC = () => {
   }, [impact, slippage])
 
   const isApproved = useCallback(() => {
-    if (item.entity.isWethCall && orderType !== Operation.CLOSE_LONG) {
+    if (
+      item.entity.isWethCall &&
+      (orderType === Operation.LONG || orderType === Operation.SHORT)
+    ) {
       return true
     } else if (item.entity.isCall) {
       return approved[0]
@@ -451,6 +453,17 @@ const Swap: React.FC = () => {
               ''
             )
           })
+      } else if (orderType === Operation.CLOSE_SHORT) {
+        onApprove(tokenAddress, spender, amount)
+          .then()
+          .catch((error) => {
+            addNotif(
+              0,
+              `Approving ${item.asset.toUpperCase()}`,
+              error.message,
+              ''
+            )
+          })
       } else if (item.entity.isWethCall) {
         // no approval
         return
@@ -827,86 +840,40 @@ const Swap: React.FC = () => {
             </div>
           ) : (
             <>
-              {orderType === Operation.SHORT ? (
-                <>
-                  {isApproved() ? (
-                    <Button
-                      disabled={
-                        !isApproved() ||
-                        !parsedAmount?.gt(0) ||
-                        error ||
-                        !hasLiquidity ||
-                        !isBelowSlippage() ||
-                        !getHasEnoughForTrade()
-                      }
-                      full
-                      size="sm"
-                      onClick={handleSubmitClick}
-                      isLoading={loading}
-                      text={
-                        !isBelowSlippage() && typedValue !== ''
-                          ? 'Price Impact Too High'
-                          : getHasEnoughForTrade()
-                          ? 'Confirm Trade'
-                          : 'Insufficient Balance'
-                      }
-                    />
-                  ) : (
-                    <>
-                      <Button
-                        disabled={parsedAmount.isZero()}
-                        full
-                        size="sm"
-                        onClick={() =>
-                          handleApproval(formatEther(getScaledAmount()))
-                        }
-                        isLoading={loading}
-                        text="Approve Tokens"
-                      />
-                    </>
-                  )}
-                </>
+              {isApproved() ? (
+                <Button
+                  disabled={
+                    !isApproved() ||
+                    !parsedAmount?.gt(0) ||
+                    error ||
+                    !hasLiquidity ||
+                    !isBelowSlippage() ||
+                    !getHasEnoughForTrade()
+                  }
+                  full
+                  size="sm"
+                  onClick={handleSubmitClick}
+                  isLoading={loading}
+                  text={
+                    !isBelowSlippage() && typedValue !== ''
+                      ? 'Price Impact Too High'
+                      : getHasEnoughForTrade()
+                      ? 'Confirm Trade'
+                      : 'Insufficient Balance'
+                  }
+                />
               ) : (
                 <>
-                  {isApproved() ? (
-                    <>
-                      {' '}
-                      <Button
-                        disabled={
-                          !isApproved() ||
-                          !parsedAmount?.gt(0) ||
-                          error ||
-                          !hasLiquidity ||
-                          !isBelowSlippage() ||
-                          !getHasEnoughForTrade()
-                        }
-                        full
-                        size="sm"
-                        onClick={handleSubmitClick}
-                        isLoading={loading}
-                        text={
-                          !isBelowSlippage() && typedValue !== ''
-                            ? 'Price Impact Too High'
-                            : getHasEnoughForTrade()
-                            ? 'Confirm Trade'
-                            : 'Insufficient Balance'
-                        }
-                      />
-                    </>
-                  ) : (
-                    <>
-                      <Button
-                        disabled={parsedAmount.isZero()}
-                        full
-                        size="sm"
-                        onClick={() =>
-                          handleApproval(formatEther(getScaledAmount()))
-                        }
-                        isLoading={loading}
-                        text="Approve Tokens"
-                      />
-                    </>
-                  )}
+                  <Button
+                    disabled={parsedAmount.isZero()}
+                    full
+                    size="sm"
+                    onClick={() =>
+                      handleApproval(formatEther(getScaledAmount()))
+                    }
+                    isLoading={loading}
+                    text="Approve Tokens"
+                  />
                 </>
               )}
             </>

diff --git a/src/state/order/hooks.tsx b/src/state/order/hooks.tsx
@@ -304,7 +304,7 @@ export const useUpdateItem = (): ((
           const isUniswap = item.venue === Venue.UNISWAP ? true : false
           const spender =
             orderType === Operation.CLOSE_SHORT || orderType === Operation.SHORT
-              ? isUniswap
+              ? !isUniswap
                 ? SUSHI_ROUTER_ADDRESS[chainId]
                 : PRIMITIVE_ROUTER[chainId].address
               : isUniswap
@@ -344,7 +344,8 @@ export const useUpdateItem = (): ((
             secondaryAddress,
             account
           )
-
+          console.log('SPENDER CHECK -> ', spender)
+          console.log(tokenAllowance.toString(), primaryBal.toString())
           dispatch(
             updateItem({
               item,