Skip to content

Commit 22db36c

Browse files
committed
Merge origin/master into feature/replace-ghostnet-with-shadownet
2 parents bdf9272 + 5092b18 commit 22db36c

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ jobs:
4141

4242
- name: Build
4343
run: yarn run build
44+
env:
45+
CI: false
4446

4547
# TO-DO: Uncomment when tests are ready to be run on CI (such as those in issues #129-#131)
4648
# - name: Test

e2e/etherlink.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { test, expect } from "@playwright/test"
22

3-
test("shows v4 daos on switching to etherlink testnet", async ({ page }) => {
3+
test("shows v4 daos on switching to etherlink shadownet", async ({ page }) => {
44
await page.goto(`/explorer/daos`)
55

66
await page.waitForLoadState("domcontentloaded")
@@ -13,10 +13,10 @@ test("shows v4 daos on switching to etherlink testnet", async ({ page }) => {
1313
console.log("Modal Title", modalTitleText)
1414
await expect(modalTitleText).toContain("Choose Network")
1515

16-
const etherlinkTestnet = await modalTitle.locator("text=Etherlink Testnet")
17-
await expect(etherlinkTestnet).toBeVisible()
16+
const etherlinkShadownet = await modalTitle.locator("text=Etherlink Shadownet")
17+
await expect(etherlinkShadownet).toBeVisible()
1818

19-
await etherlinkTestnet.click()
19+
await etherlinkShadownet.click()
2020

2121
await page.waitForTimeout(10000)
2222
await page.reload()

src/modules/etherlink/bridge/components/TxStatus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const TxStatus = ({
3030
<Typography variant="caption">
3131
{label}:{" "}
3232
<Link
33-
href={`https://testnet.explorer.etherlink.com/tx/${hash}`}
33+
href={`https://shadownet.explorer.etherlink.com/tx/${hash}`}
3434
target="_blank"
3535
rel="noopener noreferrer"
3636
style={{ color: "#4FC3F7" }}

src/services/wagmi/web3provider.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { ReactNode, useMemo } from "react"
22
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
33
import { WagmiProvider } from "wagmi"
4-
import { config } from "./config"
4+
import { config, etherlinkShadownet } from "./config"
55
import { ConnectKitProvider } from "connectkit"
6-
import { etherlink, etherlinkTestnet } from "wagmi/chains"
6+
import { etherlink } from "wagmi/chains"
77
import { useNetwork } from "services/useNetwork"
88

99
const queryClient = new QueryClient()
@@ -12,9 +12,9 @@ export const Web3Provider = ({ children }: { children: ReactNode }) => {
1212
const { network: currentNetwork } = useNetwork()
1313
const ethInitialChainId = useMemo(() => {
1414
const network = currentNetwork || "etherlink_mainnet"
15-
if (!network?.startsWith("etherlink")) return etherlinkTestnet.id
15+
if (!network?.startsWith("etherlink")) return etherlinkShadownet.id
1616
if (network?.includes("mainnet")) return etherlink.id
17-
return etherlinkTestnet.id
17+
return etherlinkShadownet.id
1818
}, [currentNetwork])
1919
const connectkitOptions = useMemo(() => ({ initialChainId: ethInitialChainId }), [ethInitialChainId])
2020

0 commit comments

Comments
 (0)