Skip to content

Commit

Permalink
Merge pull request #109 from zkLinkProtocol/feat/not_withdraw_merge
Browse files Browse the repository at this point in the history
Feat/not withdraw merge
  • Loading branch information
leochw authored Apr 14, 2024
2 parents 5a4ed69 + 3fa2acc commit d0b3978
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions views/transactions/Withdraw.vue
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,18 @@
</CommonAlert>
</transition>

<DestinationItem v-if="isMergeTokenSelected" as="div">
<template #label> Withdrawal of Merged Tokens </template>
<template #underline>
The zkLink Nova Portal currently doesn't facilitate withdrawing merged tokens. You can redeem your merged tokens back to the source token at https://zklink.io/merge/ and then proceed with the withdrawal.
</template>
<template #image>
<div class="aspect-square h-full w-full rounded-full bg-warning-400 p-3 text-black">
<LockClosedIcon aria-hidden="true" />
</div>
</template>
</DestinationItem>

<TransactionFooter>
<template #after-checks>
<CommonButton
Expand All @@ -262,7 +274,7 @@
class="w-full"
@click="buttonContinue()"
>
{{ isMergeTokenSelected ? "Redeem" : "Continue" }}
{{ isMergeTokenSelected ? "Redeem Now" : "Continue" }}
</CommonButton>
<template v-else-if="step === 'confirm'">
<transition v-bind="TransitionAlertScaleInOutTransition">
Expand Down Expand Up @@ -319,7 +331,7 @@
<script lang="ts" setup>
import { computed, onBeforeUnmount, ref, watch } from "vue";
import { ArrowTopRightOnSquareIcon, ExclamationTriangleIcon, InformationCircleIcon } from "@heroicons/vue/24/outline";
import { ArrowTopRightOnSquareIcon, ExclamationTriangleIcon, InformationCircleIcon, LockClosedIcon } from "@heroicons/vue/24/outline";
import { useRouteQuery } from "@vueuse/router";
import { BigNumber } from "ethers";
import { isAddress } from "ethers/lib/utils";
Expand Down

0 comments on commit d0b3978

Please sign in to comment.