Merge pull request #458 from primitivefinance/develop

fix(removeLP): repaired allowances
primitivefinance · Jan 29, 2021 · 4d86f12 · 4d86f12 · vercel · Jan 29, 2021
2 parents 854d5e6 + 5917959
commit 4d86f12
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/components/Market/OrderCard/components/AddLiquidity/AddLiquidity.tsx b/src/components/Market/OrderCard/components/AddLiquidity/AddLiquidity.tsx
@@ -487,6 +487,8 @@ const AddLiquidity: React.FC = () => {
             <Box column alignItems="center" justifyContent="center">
               <Button
                 disabled={true}
+                isLoading={true}
+                variant="secondary"
                 full
                 size="sm"
                 onClick={() => {}}

diff --git a/src/components/Market/OrderCard/components/RemoveLiquidity/RemoveLiquidity.tsx b/src/components/Market/OrderCard/components/RemoveLiquidity/RemoveLiquidity.tsx
@@ -430,10 +430,11 @@ const RemoveLiquidity: React.FC = () => {
         {loading ? (
           <Button
             disabled={loading}
+            variant="secondary"
             full
             size="sm"
             onClick={() => {}}
-            isLoading={false}
+            isLoading={true}
             text="Confirm"
           />
         ) : (

diff --git a/src/state/order/hooks.tsx b/src/state/order/hooks.tsx
@@ -141,8 +141,11 @@ export const useUpdateItem = (): ((
             )
             return
           }
-          if (orderType === Operation.REMOVE_LIQUIDITY_CLOSE && lpPair) {
-            const lpToken = lpPair.liquidityToken.address
+          if (
+            orderType === Operation.REMOVE_LIQUIDITY_CLOSE &&
+            item.market.liquidityToken
+          ) {
+            const lpToken = item.market.liquidityToken.address
             const optionAllowance = await getAllowance(
               item.entity.address,
               spender