Skip to content

Commit 12afaf4

Browse files
Merge branch 'migrate-to-ponder' of https://github.com/ensdomains/ens-app-v3 into migrate-to-ponder
2 parents 7fe1350 + 219f522 commit 12afaf4

File tree

8 files changed

+194
-291
lines changed

8 files changed

+194
-291
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]

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')

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
"dependencies": {
5353
"@ensdomains/address-encoder": "1.1.1",
5454
"@ensdomains/content-hash": "^3.0.0-beta.5",
55-
"@ensdomains/ens-contracts": "1.4.0-beta.2",
55+
"@ensdomains/ens-contracts": "1.4.0",
5656
"@ensdomains/ens-test-env": "0.6.0",
5757
"@ensdomains/ensjs": "4.0.3-alpha.12",
5858
"@ensdomains/thorin": "1.0.0-beta.26",
59-
"@getpara/rainbowkit": "1.2.0-dev.6",
60-
"@getpara/rainbowkit-wallet": "1.2.0-dev.5",
59+
"@getpara/rainbowkit": "1.2.0",
60+
"@getpara/rainbowkit-wallet": "1.2.0",
6161
"@metamask/post-message-stream": "^6.1.2",
6262
"@metamask/providers": "^14.0.2",
6363
"@noble/hashes": "^1.3.2",
@@ -182,7 +182,6 @@
182182
},
183183
"pnpm": {
184184
"overrides": {
185-
"@getpara/react-sdk": "1.6.1-dev.0",
186185
"@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
187186
"@wagmi/core": "2.13.3",
188187
"@walletconnect/ethereum-provider": "2.11.1",

pnpm-lock.yaml

Lines changed: 168 additions & 260 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/locales/en/ensv2.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
"text": "Layer 2 enables seamless .eth name use across blockchains with trustless connections."
1919
}
2020
},
21-
"learn-more": {
22-
"title": "Want to learn more?",
23-
"caption": "If you’re interested in learning more and building on Namechain, join the ENS Developer Telegram.",
24-
"button": "Developer Telegram"
25-
},
2621
"announcement": {
2722
"title": "Announcements",
2823
"l2": {

public/locales/es/common.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"title": "Tu nombre de usuario de Web3",
2+
"title": "Tu nombre de usuario en Web3",
33
"description": "Tu identidad en todo Web3, un nombre para todas tus direcciones de criptomonedas y tu sitio web descentralizado.",
44
"loading": "Cargando",
55
"notFound": "404 No encontrado",
@@ -417,5 +417,18 @@
417417
"ownerNotManager": "Debes estar conectado como Administrador de este nombre para establecer el registro de verificación. Puedes ver y actualizar el Administrador en la pestaña Propiedad.",
418418
"wrongAccount": "Debes estar conectado como <strong>{{nameOrAddress}}</strong> para establecer el registro de verificación.",
419419
"default": "No pudimos verificar tu cuenta. Por favor, regresa a Dentity e inténtalo de nuevo."
420+
},
421+
"homoglyph": {
422+
"content": "Este nombre contiene caracteres válidos en español (á, é, í, ó, ú, ü, ñ). A diferencia de otros idiomas:",
423+
"points": [
424+
"Son ortografía correcta (ej: «canción.eth», «México.eth»)",
425+
"NO son sustitutos de caracteres ingleses",
426+
"Se conservan exactamente como los escribes:",
427+
"- «sótano.eth» ≠ «sotano.eth»",
428+
"- «pingüino.eth» ≠ «pinguino.eth»",
429+
"Algunos sistemas antiguos podrían no soportarlos"
430+
],
431+
"link": "https://unicode.org/reports/tr36/",
432+
"title": "Caracteres del español"
420433
}
421434
}

src/pages/ens-v2.tsx

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -272,22 +272,6 @@ export default function ENSv2() {
272272
referrerPolicy="strict-origin-when-cross-origin"
273273
allowFullScreen
274274
/>
275-
<CenteredCard>
276-
<Typography fontVariant="headingTwo" as="h2">
277-
{t('learn-more.title')}
278-
</Typography>
279-
<Typography fontVariant="body">{t('learn-more.caption')}</Typography>
280-
<Button
281-
as="a"
282-
href="https://t.me/+cx5my3EQWH8wODYx"
283-
width="max"
284-
colorStyle="greenPrimary"
285-
target="_blank"
286-
rel="noopener noreferrer"
287-
>
288-
{t('learn-more.button')}
289-
</Button>
290-
</CenteredCard>
291275
<GridOneToThree>
292276
<CardWithEmoji>
293277
<Typography fontVariant="headingTwo" as="h2">
@@ -298,7 +282,7 @@ export default function ENSv2() {
298282
as="a"
299283
href="https://roadmap.ens.domains/l2-roadmap"
300284
width="max"
301-
colorStyle="greenSecondary"
285+
colorStyle="greenPrimary"
302286
target="_blank"
303287
rel="noopener noreferrer"
304288
>

src/utils/query/paraWallet.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import i18n from '../../i18n'
1313
import { ENS_LINKS, WC_PROJECT_ID } from '../constants'
1414
import { transports } from './wagmi'
1515

16-
const prodParaApiKey = 'c5695b18d016139ac4db1c7f98a87e68'
16+
const prodParaApiKey = process.env.NEXT_PUBLIC_PARA_API_KEY_PROD
1717

1818
const APP_NAME = 'ENS'
1919
const PARA_ENV: Environment = prodParaApiKey ? Environment.PROD : Environment.BETA
20-
const PARA_API_KEY = prodParaApiKey || 'de88c0d78a98dd9a3b11897893997b06'
20+
const PARA_API_KEY = prodParaApiKey || 'de88c0d78a98dd9a3b11897893997b06' // NOSONAR
2121

2222
const paraConstructorOpts: ConstructorOpts = {
2323
// Passkey Portal Branding
@@ -40,6 +40,7 @@ export const paraClient = new ParaWeb(PARA_ENV, PARA_API_KEY, paraConstructorOpt
4040
export const paraModalProps = {
4141
appName: 'ENS Manager App',
4242
oAuthMethods: [OAuthMethod.GOOGLE, OAuthMethod.DISCORD, OAuthMethod.APPLE, OAuthMethod.FACEBOOK],
43+
recoverySecretStepEnabled: true,
4344
} as const satisfies Partial<ParaModalProps>
4445

4546
const paraWalletItegratedOpts: GetParaIntegratedOpts = {

0 commit comments

Comments
 (0)