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 the hotfix to main #1257

Merged
merged 11 commits into from
Apr 8, 2024
Merged

hotfix: merge the hotfix to main #1257

Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e981eea
feat: migrated zkEVM testnet to zKyoto (#1238)
impelcrypto Mar 25, 2024
481d230
fix: XCM deposit ASTR token (#1240)
impelcrypto Mar 25, 2024
e7b0bd8
fix: price fetching (#1243)
impelcrypto Mar 25, 2024
e18ca14
Update Testnet migration warning banner's text & Add bridge warning …
gtg7784 Mar 26, 2024
ee91a6f
update to not showing red box (#1247)
gtg7784 Mar 28, 2024
4840fe0
fix: display SBY balance for EVM wallets
impelcrypto Mar 28, 2024
e47b352
resolve conflict
gtg7784 Mar 29, 2024
d0f7423
fix: conflicts
impelcrypto Mar 29, 2024
e8fb45e
enable bridge withdrawal redbox (#1256)
gtg7784 Apr 4, 2024
c1f0e45
update high traffic texts 10h -> 20h (#1258)
gtg7784 Apr 4, 2024
3938275
Merge branch 'main' into release-hotfix
gtg7784 Apr 4, 2024
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
6 changes: 5 additions & 1 deletion src/components/bridge/ethereum/L1Bridge.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<span class="color--white"> {{ $t(errMsg) }}</span>
</div>

<div v-if="fromChainName === EthBridgeNetworkName.AstarZk" class="row--box-error">
<div v-if="isWarningHighTraffic" class="row--box-error">
<span class="color--white">
{{ $t('bridge.warningHighTraffic') }}
<a class="color--white text-underline" @click="setHighTrafficModalOpen(true)">
Expand Down Expand Up @@ -278,6 +278,9 @@ export default defineComponent({
const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
const isEnabledWithdrawal = computed<boolean>(() => true);
const isHighTrafficModalOpen = ref<boolean>(false);
const isWarningHighTraffic = computed<boolean>(
() => props.fromChainName === EthBridgeNetworkName.AstarZk
);

const setHighTrafficModalOpen = (value: boolean): void => {
isHighTrafficModalOpen.value = value;
Expand Down Expand Up @@ -331,6 +334,7 @@ export default defineComponent({
approve,
isHighTrafficModalOpen,
setHighTrafficModalOpen,
isWarningHighTraffic,
};
},
});
Expand Down
Loading