fix: Only set single asset exit default to wrapped if swaps possible …

…(dm) (#3805) * fix: Exact out handler (#3793) * fix: Don't use swap exit if 1st level pool token * fix: buildExitExactTokensOut needs to have the bpt removed from tokenslist * 1.115.1 * Feat: Avalanche Support (#3487) * Feat: Avalanche Support * Add Initial contract addresses and settings for Avalanche * Add subgraphs and token addresses * Use a different public RPC. Add multicall address * Fix websocket URL, wallet enum and allowlist pools I created * Add trust wallet network for gauges and icons * Add avalanche network icon * Use new BAL token * Hide Avalanche in UI * whitelist initial boosted pools * Add pool factories. Remove pool with old BAL token from allowlist * Load ComposableStable and FX pool types * Add gyro to included pool types * Fix pools protocol features after refactor --------- Co-authored-by: ZeKraken <[email protected]> Co-authored-by: Alberto Gualis <[email protected]> * 1.115.2 * fix: Catch metadata error setting (#3794) * 1.115.3 * Update SDK * 1.115.4 * fix: Selected token in add liquidity form (#3788) * 1.115.5 * update weekly gauges and whitelist for migration (#3796) * 1.115.6 * Update `pools.ts` (#3786) Co-authored-by: Gareth Fuller <[email protected]> * 1.115.7 * fix: Wait for approvals in lock actions (#3802) * 1.115.8 * fix: Only set single asset exit default to wrapped if swaps possible --------- Co-authored-by: Alberto Gualis <[email protected]> Co-authored-by: Automated Version Bump <[email protected]> Co-authored-by: Tim Robinson <[email protected]> Co-authored-by: ZeKraken <[email protected]> Co-authored-by: Tim Robinson <[email protected]> Co-authored-by: Max Korolev <[email protected]>
Sobal · Jul 30, 2023 · b3cbe93 · b3cbe93
1 parent 0e12f6d
commit b3cbe93
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@balancer/frontend-v2",
-  "version": "1.112.3",
+  "version": "1.115.8",
   "engines": {
     "node": "=16",
     "npm": ">=8"

diff --git a/...onents/forms/lock_actions/LockForm/components/LockPreviewModal/components/LockActions.vue b/...onents/forms/lock_actions/LockForm/components/LockPreviewModal/components/LockActions.vue
@@ -57,6 +57,7 @@ const emit = defineEmits<{
 /**
  * STATE
  */
+const isLoadingApprovals = ref(true);
 const lockActionStates = reactive<LockActionState[]>(
   props.lockType.map(() => ({
     init: false,
@@ -213,6 +214,7 @@ onBeforeMount(async () => {
     actionType: ApprovalAction.Locking,
   });
   actions.value.unshift(...approvalActions);
+  isLoadingApprovals.value = false;
 });
 </script>
 
@@ -221,6 +223,7 @@ onBeforeMount(async () => {
     <BalActionSteps
       v-if="!lockActionStatesConfirmed"
       :actions="actions"
+      :isLoading="isLoadingApprovals"
       primaryActionType="extendLock"
     />
     <template v-else>

diff --git a/src/components/forms/pool_actions/WithdrawForm/WithdrawForm.vue b/src/components/forms/pool_actions/WithdrawForm/WithdrawForm.vue
@@ -55,6 +55,7 @@ const {
   hasAmountsOut,
   validAmounts,
   hasBpt,
+  shouldUseSwapExit,
 } = useExitPool();
 
 const { isWrappedNativeAssetPool } = usePoolHelpers(pool);
@@ -97,7 +98,7 @@ onBeforeMount(() => {
   if (!hasBpt.value)
     router.push({ name: 'pool', params: { networkSlug, id: props.pool.id } });
 
-  singleAmountOut.address = isPreMintedBptType(pool.value.poolType)
+  singleAmountOut.address = shouldUseSwapExit.value
     ? wrappedNativeAsset.value.address
     : pool.value.tokensList[0];
 });

diff --git a/src/providers/local/exit-pool.provider.ts b/src/providers/local/exit-pool.provider.ts
@@ -598,6 +598,7 @@ export const exitPoolProvider = (
     isTxPayloadReady,
     relayerSignature,
     relayerApprovalTx,
+    shouldUseSwapExit,
 
     // methods
     setIsSingleAssetExit,