Skip to content

Commit e596b91

Browse files
authored
Merge pull request #11429 from Jarsen136/issue-11388
fix: teleport warning
2 parents 207ccf0 + e67812c commit e596b91

File tree

5 files changed

+16
-46
lines changed

5 files changed

+16
-46
lines changed

components/teleport/EDWarningModal.vue

+4-23
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,10 @@
2828
currency,
2929
])
3030
}}
31-
<b>{{ $t('teleport.lossOfFunds') }}</b>
31+
<b>{{ $t('teleport.failedTransaction') }}</b>
3232
</span>
33-
<div class="flex py-4">
34-
<NeoCheckbox
35-
v-model="checked"
36-
class="mr-3 text-xs"
37-
:label="$t('teleport.checkboxLabel')"
38-
/>
39-
</div>
4033
</div>
41-
<div class="flex mt-5 items-center justify-between">
42-
<NeoButton
43-
variant="pill"
44-
:disabled="!checked"
45-
class="mr-4"
46-
no-shadow
47-
:label="$t('massmint.mobileDisclaimer.continueAnyway')"
48-
@click="emit('continue')"
49-
/>
34+
<div class="flex mt-5 items-center justify-center">
5035
<NeoButton
5136
variant="pill"
5237
:label="$t('autoTeleport.close')"
@@ -58,7 +43,7 @@
5843
</template>
5944

6045
<script setup lang="ts">
61-
import { NeoButton, NeoCheckbox, NeoIcon, NeoModal } from '@kodadot1/brick'
46+
import { NeoButton, NeoIcon, NeoModal } from '@kodadot1/brick'
6247
6348
const props = defineProps<{
6449
modelValue: boolean
@@ -69,10 +54,6 @@ const props = defineProps<{
6954
}>()
7055
7156
const isModalActive = useVModel(props, 'modelValue')
72-
const checked = ref(false)
73-
watch(isModalActive, () => {
74-
checked.value = false
75-
})
7657
77-
const emit = defineEmits(['close', 'continue'])
58+
const emit = defineEmits(['close'])
7859
</script>

components/teleport/FundsAtRiskWarning.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
targetExistentialDeposit,
2626
])
2727
}}
28-
<b>{{ $t('teleport.lossOfFunds') }}</b>
28+
<b>{{ $t('teleport.failedTransaction') }}</b>
2929
</span>
3030
<a
3131
v-safe-href="

components/teleport/Teleport.vue

+8-14
Original file line numberDiff line numberDiff line change
@@ -172,21 +172,15 @@
172172
</a>
173173
{{ $t('teleport.ownerMessage') }}
174174
</div>
175+
<TeleportEDWarningModal
176+
v-model="insufficientEDModalOpen"
177+
:target-existential-deposit="targetExistentialDeposit.displayValue"
178+
:source-existential-deposit="sourceExistentialDeposit.displayValue"
179+
:reason="warningReason"
180+
:currency="currency"
181+
@close="insufficientEDModalOpen = false"
182+
/>
175183
</form>
176-
<TeleportEDWarningModal
177-
v-model="insufficientEDModalOpen"
178-
:target-existential-deposit="targetExistentialDeposit.displayValue"
179-
:source-existential-deposit="sourceExistentialDeposit.displayValue"
180-
:reason="warningReason"
181-
:currency="currency"
182-
@continue="
183-
() => {
184-
insufficientEDModalOpen = false
185-
teleport()
186-
}
187-
"
188-
@close="insufficientEDModalOpen = false"
189-
/>
190184
</template>
191185

192186
<script setup lang="ts">

i18n/locales/en.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1926,28 +1926,27 @@
19261926
"artistProfile": "Go to artist's profile",
19271927
"bridging": "Bridging {0} {1}",
19281928
"btnCopyPayment": "Copy Payment link",
1929-
"checkboxLabel": "I understand this action will lead to an irreversible loss of funds.",
19301929
"congratsSupport": "Congratulations for supporting",
19311930
"destination": "Destination",
19321931
"donationSentTo": "Your donation will be sent to:",
19331932
"existentialDepositTooltip": "Amounts Below {0} + Fees Risk Being Lost. Enter The Minimum To Proceed.",
1933+
"failedTransaction": "Failed Transaction and Loss of Transaction Fee",
19341934
"from": "From",
19351935
"fundLossRisk": "Funds Loss Risk",
19361936
"fundsAtRisk": "Funds at risk",
19371937
"howItWorks": "How It Works?",
19381938
"insufficientAmountAfterFees": "Insufficient amount after fees",
19391939
"insufficientBalance": "Insufficient {0} Balance",
1940-
"lossOfFunds": "Loss Of Funds.",
19411940
"max": "Max",
19421941
"ownerMessage": "(You Are Owner)",
19431942
"page": "Teleport",
19441943
"proceedToConfirmation": "Proceed To Confirmation",
19451944
"receiveValue": "You will receive {0} {1} on {2} to",
19461945
"send": "Send",
19471946
"source": "Source chain",
1948-
"sourceExistentialDepositWarning": "keeping Less Than {0} {1} (existential deposit) + Fees Will Lead To An Irreversible",
1947+
"sourceExistentialDepositWarning": "Keeping Less Than {0} {1} (existential deposit) + Fees Will Lead To",
19491948
"subtitle": "Easy Asset Teleportation from One Network to Another",
1950-
"targetExistentialDepositWarning": "Transferring Less Than {0} {1} (existential deposit) + Fees Will Lead To An Irreversible",
1949+
"targetExistentialDepositWarning": "Transferring Less Than {0} {1} (existential deposit) + Fees Will Lead To",
19511950
"to": "To",
19521951
"tweetDonation": "Tweet about your awesome donation",
19531952
"usdInput": "USD Value (approx)",

i18n/locales/hi.json

-4
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,6 @@
14271427
"amount": "Asset मात्रा",
14281428
"artistProfile": "कलाकार के प्रोफाइल पर जाएं",
14291429
"btnCopyPayment": "भुगतान लिंक कॉपी करें",
1430-
"checkboxLabel": "मुझे समझ में आता है कि इस क्रिया से धन की अपरिवर्तनी हानि होगी।",
14311430
"congratsSupport": "समर्थन के लिए बधाई",
14321431
"destination": "गंतव्य",
14331432
"donationSentTo": "आपका दान भेजा जाएगा:",
@@ -1438,17 +1437,14 @@
14381437
"howItWorks": "यह कैसे काम करता है?",
14391438
"insufficientAmountAfterFees": "शुल्क के बाद अपर्याप्त मात्रा",
14401439
"insufficientBalance": "अपर्याप्त {0} शेष",
1441-
"lossOfFunds": "Fund्स की हानि।",
14421440
"max": "अधिकतम",
14431441
"ownerMessage": "(आप मालिक हैं)",
14441442
"page": "टेलीपोर्ट",
14451443
"proceedToConfirmation": "पुष्टि के लिए आगे बढ़ें",
14461444
"receiveValue": "आपको {0} {1} प्राप्त होगा {2} पर",
14471445
"send": "भेजें",
14481446
"source": "स्रोत श्रृंग",
1449-
"sourceExistentialDepositWarning": "एक अपरिवर्तनी होगा जब भी {0} {1} (अस्तित्व जमा) + शुल्क कम से कम होगा",
14501447
"subtitle": "एक Network से दूसरे Network में आसान Asset Teleportation",
1451-
"targetExistentialDepositWarning": "एक अपरिवर्तनी होगा जब भी {0} {1} (अस्तित्व जमा) + शुल्क कम से कम होगा",
14521448
"to": "को",
14531449
"tweetDonation": "अपने शानदार दान के बारे में ट्वीट करें",
14541450
"usdInput": "USD मूल्य (अनुमानित)",

0 commit comments

Comments
 (0)