Skip to content

Commit 2a43dd8

Browse files
Merge branch 'main' into fix/safe-gas-estimates
2 parents 065ab16 + 413bc43 commit 2a43dd8

File tree

19 files changed

+205
-600
lines changed

19 files changed

+205
-600
lines changed

.github/workflows/pages-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Cloudflare Pages
33
env:
44
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
55
NEXT_PUBLIC_INTERCOM_ID: re9q5yti
6-
NEXT_PUBLIC_PARA_API_KEY_PROD: ${{ secrets.PARA_API_KEY_PROD }}
6+
NEXT_PUBLIC_PARA_API_KEY_PROD: ${{ github.ref == 'refs/heads/main' && secrets.NEXT_PUBLIC_PARA_API_KEY_PROD || '' }}
77
NEXT_PUBLIC_DRPC_KEY: AnmpasF2C0JBqeAEzxVO8aTteiMlrW4R75hpDonbV6cR
88

99
on: [push]

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @sugh01
1+
* @sugh01 @laurgk

e2e/specs/stateful/dnsclaim.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ test.describe('Import DNSSEC name', () => {
3131
await expect(page.getByTestId('import-next-button')).toBeDisabled()
3232
})
3333

34-
// TODO: this is failing because stateful tests are still on goerli, we should switch to sepolia/holesky
35-
test.skip('should not allow the user to proceed if they have not set the correct TXT record - offchain', async ({
34+
test('should not allow the user to proceed if they have not set the correct TXT record - offchain', async ({
3635
page,
3736
login,
3837
}) => {
@@ -43,10 +42,10 @@ test.describe('Import DNSSEC name', () => {
4342
await page.getByTestId('import-next-button').click()
4443
await expect(page.getByTestId('import-heading')).toContainText('Verify Ownership')
4544
await expect(page.getByTestId('status-checker-message')).toContainText('No record found')
46-
await expect(page.getByTestId('import-next-button')).toBeDisabled()
45+
await expect(page.getByTestId('offchain-claim')).toBeDisabled()
4746
})
4847

49-
test('should not allow the use to proceed if they have not set the correct subdomain with the correct info', async ({
48+
test('should not allow the user to proceed if they have not set the correct subdomain with the correct info', async ({
5049
page,
5150
login,
5251
}) => {
@@ -60,7 +59,8 @@ test.describe('Import DNSSEC name', () => {
6059
await expect(page.getByTestId('import-next-button')).toBeDisabled()
6160
})
6261

63-
test('should resolve .pw domains', async ({ page, login }) => {
62+
test.skip('should resolve .pw domains', async ({ page, login }) => {
63+
// pw domain does not resolve on localhost
6464
await page.goto('/test.pw?chain=holesky')
6565
await login.connect()
6666

e2e/specs/stateless/wrapName.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,10 @@ test('should calculate needed steps without localstorage', async ({
287287
await transactionModal.introButton.click()
288288
await transactionModal.confirm()
289289
await transactionModal.complete()
290-
await expect(page.getByTestId('namewrapper-status')).not.toContainText('Unwrapped')
290+
291+
await expect(page.getByTestId('namewrapper-status')).not.toContainText('Unwrapped', {
292+
timeout: 10000,
293+
})
291294

292295
await profilePage.goto(subname)
293296
await expect(profilePage.record('text', 'description')).toHaveText('test')

next.config.mjs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { execSync } from 'child_process'
77
import path, { dirname } from 'path'
88
import { fileURLToPath } from 'url'
99

10-
import { withSentryConfig } from '@sentry/nextjs'
1110
import StylelintPlugin from 'stylelint-webpack-plugin'
1211

1312
const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -255,12 +254,4 @@ if (process.env.ANALYZE) {
255254
plugins.push(withBundleAnalyzer({ enabled: true }))
256255
}
257256

258-
if (process.env.CI && process.env.NODE_ENV === 'production' && !process.env.NEXT_PUBLIC_IPFS) {
259-
plugins.push((config) =>
260-
withSentryConfig(config, {
261-
silent: false,
262-
}),
263-
)
264-
}
265-
266257
export default plugins.reduce((acc, next) => next(acc), nextConfig)

next.config.wizardcopy.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"dev:holesky": "NEXT_PUBLIC_CHAIN_NAME=holesky pnpm dev",
77
"dev:sepolia": "NEXT_PUBLIC_CHAIN_NAME=sepolia pnpm dev",
88
"dev:https": "next dev --experimental-https --port 443",
9+
"dev:https:holesky": "NEXT_PUBLIC_CHAIN_NAME=holesky pnpm dev:https",
10+
"dev:https:sepolia": "NEXT_PUBLIC_CHAIN_NAME=sepolia pnpm dev:https",
911
"dev:nlocal": "NEXT_PUBLIC_PROVIDER=http://localhost:8545 NEXT_PUBLIC_AVUP_ENDPOINT=http://localhost:8787 pnpm dev",
1012
"dev:localname": "NEXT_PUBLIC_PROVIDER=\"http://$(\"hostname\"):8545\" && NEXT_PUBLIC_AVUP_ENDPOINT=\"http://$(\"hostname\"):8787\" && NEXT_PUBLIC_GRAPH_URI=\"http://$(\"hostname\"):8000/subgraphs/name/graphprotocol/ens\" && pnpm dev",
1113
"dev:glocal": "SWC_CACHE=false rm -rf .next && NEXT_PUBLIC_GRAPH_URI=http://localhost:8000/subgraphs/name/graphprotocol/ens NEXT_PUBLIC_ETH_NODE=anvil pnpm dev:nlocal",
@@ -57,16 +59,15 @@
5759
"@metamask/post-message-stream": "^6.1.2",
5860
"@metamask/providers": "^14.0.2",
5961
"@noble/hashes": "^1.3.2",
60-
"@sentry/nextjs": "7.43.x",
6162
"@splidejs/react-splide": "^0.7.12",
6263
"@svgr/webpack": "^8.1.0",
6364
"@tanstack/query-persist-client-core": "5.22.2",
6465
"@tanstack/query-sync-storage-persister": "5.22.2",
6566
"@tanstack/react-query": "5.22.2",
6667
"@tanstack/react-query-devtools": "^5.59.0",
6768
"@tanstack/react-query-persist-client": "5.22.2",
68-
"@getpara/rainbowkit": "1.2.0-dev.6",
69-
"@getpara/rainbowkit-wallet": "1.2.0-dev.5",
69+
"@getpara/rainbowkit": "1.2.0",
70+
"@getpara/rainbowkit-wallet": "1.2.0",
7071
"@wagmi/core": "2.13.3",
7172
"calendar-link": "^2.8.0",
7273
"dequal": "2.0.3",
@@ -80,10 +81,10 @@
8081
"idb-keyval": "^6.2.1",
8182
"immer": "^9.0.15",
8283
"iso-639-1": "^2.1.15",
83-
"node-forge": "1.3.1",
8484
"markdown-to-jsx": "^7.7.3",
8585
"next": "13.5.8",
8686
"node-fetch": "^3.3.2",
87+
"node-forge": "1.3.1",
8788
"posthog-js": "^1.217.0",
8889
"react": "*",
8990
"react-confetti": "6.1.0",
@@ -181,7 +182,6 @@
181182
},
182183
"pnpm": {
183184
"overrides": {
184-
"@getpara/react-sdk": "1.6.1-dev.0",
185185
"@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
186186
"@wagmi/core": "2.13.3",
187187
"@walletconnect/ethereum-provider": "2.11.1",

0 commit comments

Comments
 (0)