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

CCIP integration #1431

Merged
merged 8 commits into from
Jan 14, 2025
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: conflicts
impelcrypto committed Jan 13, 2025
commit 80111598b33ca4d12cbfb5ff7ce105597ee4909f
25 changes: 9 additions & 16 deletions src/components/assets/EvmNativeToken.vue
Original file line number Diff line number Diff line change
@@ -160,7 +160,12 @@ import { cbridgeAppLink } from 'src/c-bridge';
import ModalFaucet from 'src/components/assets/modals/ModalFaucet.vue';
import Balloon from 'src/components/common/Balloon.vue';
import { LOCAL_STORAGE } from 'src/config/localStorage';
import { ccipMinatoBridgeEnabled, layerZeroBridgeEnabled, nativeBridgeEnabled } from 'src/features';
import {
ccipMinatoBridgeEnabled,
layerZeroBridgeEnabled,
nativeBridgeEnabled,
ccipSoneiumBridgeEnabled,
} from 'src/features';
import { useAccount, useBreakpoints, useFaucet, useNetworkInfo } from 'src/hooks';
import { faucetSethLink } from 'src/links';
import { getTokenImage } from 'src/modules/token';
@@ -172,12 +177,7 @@ import {
} from 'src/router/routes';
import { useStore } from 'src/store';
import { computed, defineComponent, ref, watch, watchEffect } from 'vue';
import {
nativeBridgeEnabled,
layerZeroBridgeEnabled,
ccipMinatoBridgeEnabled,
ccipSoneiumBridgeEnabled,
} from 'src/features';

import CustomRouterLink from '../common/CustomRouterLink.vue';

export default defineComponent({
@@ -201,15 +201,8 @@ export default defineComponent({
const isBalloonClosing = ref<boolean>(false);
const isSoneiumButtonHover = ref<boolean>(false);

const {
currentNetworkName,
nativeTokenSymbol,
isZkEvm,
isZkyoto,
isAstar,
isShibuyaEvm,
isAstarEvm,
} = useNetworkInfo();
const { currentNetworkName, nativeTokenSymbol, isZkEvm, isAstar, isShibuyaEvm, isAstarEvm } =
useNetworkInfo();

const closeCcipBalloon = () => {
isCcipBalloon.value = false;
3 changes: 2 additions & 1 deletion src/components/bridge/BridgeSelection.vue
Original file line number Diff line number Diff line change
@@ -250,8 +250,8 @@ import {
celerBridgeEnabled,
layerSwapBridgeEnabled,
layerZeroBridgeEnabled,
ccipMinatoBridgeEnabled,
ccipSoneiumBridgeEnabled,
nativeBridgeEnabled,
} from 'src/features';
import { useAccount, useNetworkInfo } from 'src/hooks';
import { EthBridgeNetworkName } from 'src/modules/zk-evm-bridge';
@@ -279,6 +279,7 @@ export default defineComponent({
isH160,
isShibuyaEvm,
isAstarEvm,
nativeTokenSymbol,
} = useNetworkInfo();

const l1Name = computed<string>(() => {
You are viewing a condensed version of this merge commit. You can view the full changes here.