diff --git a/public/etherlink-favicon.png b/public/etherlink-favicon.png new file mode 100644 index 00000000..9064b809 Binary files /dev/null and b/public/etherlink-favicon.png differ diff --git a/public/images/logos/etherlink-logo.svg b/public/images/logos/etherlink-logo.svg new file mode 100644 index 00000000..67a8c802 --- /dev/null +++ b/public/images/logos/etherlink-logo.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/images/logos/taiko-logo.svg b/public/images/logos/taiko-logo.svg new file mode 100644 index 00000000..f34fe4fc --- /dev/null +++ b/public/images/logos/taiko-logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/taiko-favicon.png b/public/taiko-favicon.png new file mode 100644 index 00000000..29a53c1b Binary files /dev/null and b/public/taiko-favicon.png differ diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index 752fff1c..1a6cb659 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -577,7 +577,7 @@ html[data-theme='etherlink'] { --color-gray-400: 154, 154, 154; /* Text Secondary dark */ --color-gray-500: 75, 75, 75; --color-gray-600: 57, 57, 57; - --color-gray-700: 39, 39, 39; /* Select Box Background */ + --color-gray-700: 69, 69, 69; /* Select Box Background */ --color-gray-800: 27, 27, 27; /* Box Input Background */ --color-gray-900: 18, 18, 18; /* Box Background */ --color-gray-850: 23, 23, 23; /* Background */ diff --git a/src/assets/images/icons/networks/taiko.svg b/src/assets/images/icons/networks/taiko.svg index a2bae805..a2a77363 100644 --- a/src/assets/images/icons/networks/taiko.svg +++ b/src/assets/images/icons/networks/taiko.svg @@ -1,8 +1,3 @@ - - - - - - - - + + + diff --git a/src/components/btns/DarkModeToggle.vue b/src/components/btns/DarkModeToggle.vue index fd4fac88..32850e3c 100644 --- a/src/components/btns/DarkModeToggle.vue +++ b/src/components/btns/DarkModeToggle.vue @@ -1,16 +1,24 @@ +s \ No newline at end of file diff --git a/src/composables/useBackgroundColor.ts b/src/composables/useBackgroundColor.ts index 81b6a2ce..0e6437e7 100644 --- a/src/composables/useBackgroundColor.ts +++ b/src/composables/useBackgroundColor.ts @@ -12,6 +12,7 @@ import { ref, watch } from 'vue'; import { RouteLocationNormalizedLoaded, useRoute } from 'vue-router'; import useDarkMode from '@/composables/useDarkMode'; +import { networkSlug } from './useNetwork'; /** * CONSTANTS @@ -41,7 +42,7 @@ function setBackgroundColor(color: string): void { function setDefaultBgColor(): void { if (darkMode.value) { setBackgroundColor(defaultDarkBgColor); - } else { + } else if (networkSlug !== 'etherlink' && networkSlug !== 'taiko') { setBackgroundColor(defaultBgColor); } } diff --git a/src/composables/useDarkMode.ts b/src/composables/useDarkMode.ts index 5bec8b65..687120e4 100644 --- a/src/composables/useDarkMode.ts +++ b/src/composables/useDarkMode.ts @@ -2,15 +2,28 @@ import { ref } from 'vue'; import LS_KEYS from '@/constants/local-storage.keys'; import { lsSet } from '@/lib/utils'; +import { networkSlug } from './useNetwork'; // const osDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches; // const lsDarkMode = // lsGet(LS_KEYS.App.DarkMode, osDarkMode.toString()) === 'true'; -const lsDarkMode = LS_KEYS.App.DarkMode === 'true'; +const lsDarkMode = ref(LS_KEYS.App.DarkMode === 'true'); // STATE -const darkMode = ref(lsDarkMode); +const darkMode = computed({ + get() { + if (networkSlug === 'etherlink' || networkSlug === 'taiko') { + return true; + } + return lsDarkMode.value; + }, + set(value: boolean) { + if (networkSlug !== 'etherlink' && networkSlug !== 'taiko') { + lsDarkMode.value = value; + } + }, +}); // MUTATIONS function setDarkMode(val: boolean): void { @@ -18,7 +31,7 @@ function setDarkMode(val: boolean): void { lsSet(LS_KEYS.App.DarkMode, darkMode.value.toString()); if (darkMode.value) { document.documentElement.classList.add('dark'); - } else { + } else if (networkSlug !== 'etherlink' && networkSlug !== 'taiko') { document.documentElement.classList.remove('dark'); } } diff --git a/src/lib/config/etherlink/pools.ts b/src/lib/config/etherlink/pools.ts index 04a9f90f..3626329b 100644 --- a/src/lib/config/etherlink/pools.ts +++ b/src/lib/config/etherlink/pools.ts @@ -15,7 +15,7 @@ const pools: Pools = { DynamicFees: { Gauntlet: [], }, - BlockList: [], + BlockList: [''], IncludedPoolTypes: [ 'Weighted', 'Stable', @@ -35,7 +35,10 @@ const pools: Pools = { Weighted: { // Only effective after given timestamp here: usePool.ts#createdAfterTimestamp // see useDisabledJoinPool.ts#nonAllowedWeightedPoolAfterTimestamp for logic. - AllowList: [], + AllowList: [ + '0xed18b89e2a1b64e4390099869ae7010e47261086000200000000000000000002', // WXTZ-USDC + '0xe9ea69169449fbb708bcec267f3e9c0643ecfb52000200000000000000000003', // WETH-USDC + ], }, Factories: { '0x4e4131dc27ed9501ac5feb76f94572fdae9f0fd0': 'weightedPool', // Weighted V5 diff --git a/src/lib/config/taiko/pools.ts b/src/lib/config/taiko/pools.ts index 572a8602..3a9cbd01 100644 --- a/src/lib/config/taiko/pools.ts +++ b/src/lib/config/taiko/pools.ts @@ -39,6 +39,7 @@ const pools: Pools = { // see useDisabledJoinPool.ts#nonAllowedWeightedPoolAfterTimestamp for logic. AllowList: [ '0xe0f51bf8d30db81d0a93125a17a2a40130ad9f7e000200000000000000000004', //WETH-USDC + '0x27ebdb9db75b8ca967ec331cb1e74880f1d7f0a8000200000000000000000005', //TAIKO-WETH ], }, Factories: { diff --git a/src/locales/default.json b/src/locales/default.json index 203bc1e2..98ba6b19 100644 --- a/src/locales/default.json +++ b/src/locales/default.json @@ -226,7 +226,7 @@ "poolSummary": "Pool summary", "poolAlreadyExists": "This pool already exists", "previewPool": "Preview new {0} pool", - "recommendedLiquidity": "It’s recommended to provide new pools with at least $20,000 in initial funds", + "recommendedLiquidity": "It’s recommended to provide new pools with at least $2,000 in initial funds", "recoveredState": "We've recovered your previous choices", "recoveredStateInfo": "You previously left before creating this pool. Your choices have been saved so you can continue from before.", "similarPoolsExist": "Similar pools exist",