Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added warning messages in ERC20 token transfer UI #1011

Merged
merged 6 commits into from
Nov 7, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: wip
impelcrypto committed Nov 7, 2023
commit 6243382297737367301a4291eda2ae1a66598e54
23 changes: 20 additions & 3 deletions src/components/assets/transfer/LocalTransfer.vue
Original file line number Diff line number Diff line change
@@ -157,9 +157,26 @@
{{ $t('warning.warning') }}
</span>
</div>
<div class="text--warn">
{{ $t('assets.modals.notDestIsLedgerAccount') }}
</div>
<ul class="column--warnings">
<li>
<span class="text--warn">
<!-- {{ $t('assets.modals.notDestIsLedgerAccount') }} -->
I’m not sending tokens to exchange address.
</span>
</li>
<li>
<span class="text--warn">
<!-- {{ $t('assets.modals.notDestIsLedgerAccount') }} -->
ERC20 tokens cannot be sent to Astar Native addresses.
</span>
</li>
<li>
<span class="text--warn">
<!-- {{ $t('assets.modals.notDestIsLedgerAccount') }} -->
I understand that if I do so, the funds will likely be lost.
</span>
</li>
</ul>
</span>
</label>
</div>
10 changes: 8 additions & 2 deletions src/components/assets/transfer/styles/local-transfer.scss
Original file line number Diff line number Diff line change
@@ -299,8 +299,8 @@
}

.text--warn {
padding-left: 10px;
line-height: 20px;
// padding-left: 10px;
// line-height: 20px;
}

.text--title-evm-warning {
@@ -317,6 +317,12 @@
color: $warning-red;
}

.column--warnings {
display: flex;
flex-direction: column;
list-style-type: circle;
}

.body--dark {
.box--input-field {
background: transparent;
5 changes: 4 additions & 1 deletion src/hooks/transfer/useTokenTransfer.ts
Original file line number Diff line number Diff line change
@@ -106,7 +106,6 @@ export function useTokenTransfer(selectedToken: Ref<Asset>) {

const inputHandler = (event: any): void => {
transferAmt.value = event.target.value;
errMsg.value = '';
};

const resetStates = (): void => {
@@ -135,12 +134,14 @@ export function useTokenTransfer(selectedToken: Ref<Asset>) {
if (isLoading.value) return;
const transferAmtRef = Number(transferAmt.value);
try {
console.log('setErrorMsg');
if (transferAmtRef && transferAmtRef > fromAddressBalance.value) {
errMsg.value = t('warning.insufficientBalance', {
token: selectedToken.value.metadata.symbol,
});
} else if (toAddress.value && !isValidDestAddress.value) {
errMsg.value = 'warning.inputtedInvalidDestAddress';
return;
} else if (
isH160.value &&
toAddress.value &&
@@ -153,8 +154,10 @@ export function useTokenTransfer(selectedToken: Ref<Asset>) {
token: nativeTokenSymbol.value,
});
} else {
console.log('else');
errMsg.value = '';
}
console.log('errMsg.value', errMsg.value);
} catch (error: any) {
errMsg.value = error.message;
}