Skip to content

Commit

Permalink
hotfix: merge the hotfix to main (#1257)
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 <[email protected]>

* update to now showing redbox

* update to remove hard-corded false

---------

Co-authored-by: Roy <[email protected]>

* fix: display SBY balance for EVM wallets

* enable bridge withdrawal redbox (#1256)

* update high traffic texts 10h -> 20h (#1258)

---------

Co-authored-by: Alan <[email protected]>
  • Loading branch information
impelcrypto and gtg7784 authored Apr 8, 2024
1 parent a178181 commit e0982a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/components/bridge/ethereum/L1Bridge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export default defineComponent({
const isEnabledWithdrawal = computed<boolean>(() => true);
const isHighTrafficModalOpen = ref<boolean>(false);
const isWarningHighTraffic = computed<boolean>(
() => false && props.fromChainName === EthBridgeNetworkName.AstarZk
() => props.fromChainName === EthBridgeNetworkName.AstarZk
);
const setHighTrafficModalOpen = (value: boolean): void => {
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/en-US/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1041,12 +1041,12 @@ export default {
'Bridging to L1 (Ethereum) involves 2 steps, and it requires users to make a claim on the L1 network (available in Recent History)',
gelatoApiError: 'Bridge UI is not available, please try again later',
warningHighTraffic:
'High bridge traffic may delay withdrawal transactions up to 10 hours. We appreciate your patience.',
'High bridge traffic may delay withdrawal transactions up to 20 hours. We appreciate your patience.',
warningHighTrafficMore: '(read more)',
modals: {
highTraffic: {
text1:
'We are currently experiencing unusually high traffic on our canonical bridge, leading to longer than usual processing times for withdrawal. Your transaction may take up to 10 hours to complete. We understand how valuable your time is and are working diligently to resolve this congestion by scaling the infrastructure.',
'We are currently experiencing unusually high traffic on our canonical bridge, leading to longer than usual processing times for withdrawal. Your transaction may take up to 20 hours to complete. We understand how valuable your time is and are working diligently to resolve this congestion by scaling the infrastructure.',
text2:
'For urgent transactions, you might consider scheduling them during off-peak hours or exploring alternative 3rd party bridge partners. We appreciate your patience and understanding as we strive to enhance your experience. Thank you for your continued support.',
understood: 'Understood',
Expand Down

0 comments on commit e0982a5

Please sign in to comment.