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.

Sign up for GitHub

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

hotfix: merge to the main branch #1441

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hotfix: merge to the main branch #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/components/bridge/ccip/CcipBridge.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,14 @@
</ul>
</div>

<div v-if="!ccipBridgeEnabled" class="row--box-error">
<div v-if="!isH160" class="row--box-error">
<span class="color--white">
{{ $t('bridge.underMaintenance') }}
{{ $t('bridge.warningInvalidWallet') }}
</span>
</div>
<div v-else-if="!ccipBridgeEnabled" class="row--box-error">
<span class="color--white">
{{ $t('bridge.ccipUnderMaintenance') }}
</span>
</div>

Expand Down Expand Up @@ -255,7 +260,7 @@ export default defineComponent({
},
setup(props) {
const { currentAccount } = useAccount();
const { nativeTokenSymbol, isShibuyaEvm, isAstarEvm } = useNetworkInfo();
const { nativeTokenSymbol, isShibuyaEvm, isAstarEvm, isH160 } = useNetworkInfo();
const store = useStore();
const isHandling = ref<boolean>(false);
const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
Expand Down Expand Up @@ -350,6 +355,7 @@ export default defineComponent({
ccipBridgeTime,
isApproveButtonDisabled,
isBridgeButtonDisabled,
isH160,
truncate,
bridge,
approve,
Expand Down
3 changes: 3 additions & 0 deletions src/i18n/en-US/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,11 @@ export default {
warningHighTraffic:
'High bridge traffic may delay withdrawal transactions up to 5 hours. We appreciate your patience.',
warningHighTrafficMore: '(read more)',
warningInvalidWallet: 'Please connect your EVM wallet to use the bridge',
underMaintenance:
'Astar zkEVM is currently under the maintenance. We apologize for any inconvenience.',
ccipUnderMaintenance:
'CCIP bridge is currently under the maintenance. We apologize for any inconvenience.',
modals: {
highTraffic: {
text1:
Expand Down
Loading