Skip to content

Commit

Permalink
hotfix: merge the hotfix to main branch (#1248)
Browse files Browse the repository at this point in the history
* feat: migrated zkEVM testnet to zKyoto (#1238)

* fix: changed zKatana to zKyoto

* fix: updated logic

* fix: updated balance logic

* fix: updated RPC

* fix: updated bridge section

* fix: updated zkatana name

* fix: explorer link

* fix: XCM deposit ASTR token (#1240)

* fix: price fetching (#1243)

* Update Testnet migration warning banner's text & Add bridge warning  (#1244)

* update testnetSwitchWarning content

* add native gridge high traffic warning box

* only displays native bridge high traffic on zkEVM

* add bridge high traffic modal

* add read more to red warning

* fix font color of content in bridge high traffic modal

* update to not showing red box (#1247)

* feat: display amount of bonus rewards (#1236)

* hotfix: merge the hotfix to main branch  (#1241)

* feat: migrated zkEVM testnet to zKyoto (#1238)

* fix: changed zKatana to zKyoto

* fix: updated logic

* fix: updated balance logic

* fix: updated RPC

* fix: updated bridge section

* fix: updated zkatana name

* fix: explorer link

* fix: XCM deposit ASTR token (#1240)

* fix: price fetching (#1243)

* Update Testnet migration warning banner's text & Add bridge warning  (#1244)

* update testnetSwitchWarning content

* add native gridge high traffic warning box

* only displays native bridge high traffic on zkEVM

* add bridge high traffic modal

* add read more to red warning

* fix font color of content in bridge high traffic modal

---------

Co-authored-by: Alan <tae.gun7784@gmail.com>

* update to now showing redbox

* update to remove hard-corded false

---------

Co-authored-by: Roy <92044428+impelcrypto@users.noreply.github.com>

* fix: display SBY balance for EVM wallets

---------

Co-authored-by: Alan <tae.gun7784@gmail.com>
  • Loading branch information
impelcrypto and gtg7784 committed Mar 29, 2024
1 parent 7957f0c commit d2e320c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/components/bridge/ethereum/L1Bridge.vue
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>(
() => false && 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

0 comments on commit d2e320c

Please sign in to comment.