From 725c88fa94bab08813dfa41391db8c129941cf22 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Wed, 25 Sep 2024 22:36:01 +0800 Subject: [PATCH 01/22] add windows.security.credentials.ui' --- apps/desktop/package.json | 3 ++- apps/desktop/src-electron/app.ts | 23 ++++++++++++++++++++--- yarn.lock | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index a3b4168a2ec..51c2ce0f5ec 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -40,7 +40,8 @@ "electron-store": "^8.2.0", "electron-updater": "6.1.8", "keytar": "^7.9.0", - "node-fetch": "^2.6.7" + "node-fetch": "^2.6.7", + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index 9a7e109aab6..35018b9127c 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -18,6 +18,9 @@ import { import contextMenu from 'electron-context-menu'; import isDev from 'electron-is-dev'; import logger from 'electron-log/main'; +import windowsSecurityCredentialsUiModule, { + UserConsentVerifierAvailability, +} from 'windows.security.credentials.ui'; import { ONEKEY_APP_DEEP_LINK_NAME, @@ -511,9 +514,23 @@ function createMainWindow() { } }); - ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, (event) => { - const result = systemPreferences?.canPromptTouchID?.(); - event.returnValue = !!result; + ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, async (event) => { + let result = !!systemPreferences?.canPromptTouchID?.(); + if (!result && isWin) { + result = await new Promise((resolve) => { + windowsSecurityCredentialsUiModule.UserConsentVerifier.checkAvailabilityAsync( + (error, status) => { + if (error) { + resolve(true); + } else { + result = !!result; + resolve(status === UserConsentVerifierAvailability.available); + } + }, + ); + }); + } + event.returnValue = result; }); ipcMain.on(ipcMessageKeys.APP_GET_ENV_PATH, (event) => { diff --git a/yarn.lock b/yarn.lock index bb92535104c..d4aa42cdaf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,6 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd" languageName: unknown linkType: soft @@ -28675,6 +28676,15 @@ __metadata: languageName: node linkType: hard +"nan@npm:latest": + version: 2.20.0 + resolution: "nan@npm:2.20.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10/5f16e4c9953075d9920229c703c1d781c0b74118ce3d9e926b448a4eef92b7d8be5ac6adc748a13a5fafb594436cbfe63250e3471aefdd78e3a0cd14603b9ba7 + languageName: node + linkType: hard + "nano-json-stream-parser@npm:^0.1.2": version: 0.1.2 resolution: "nano-json-stream-parser@npm:0.1.2" @@ -38221,6 +38231,15 @@ __metadata: languageName: node linkType: hard +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd": + version: 0.1.7 + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=08c7c97410b0fce97cc6aeb2f50d599db6034fcd" + dependencies: + nan: "npm:latest" + checksum: 10/ae58183cf173de9de6ebbfc3a0435bc95ac45ac828e097e5ce0996ffec5236b085c9cb46549418fdfe5a5194d660592e9a751edc8322f125528d83dc8e67ffb3 + languageName: node + linkType: hard + "wonka@npm:^4.0.14": version: 4.0.15 resolution: "wonka@npm:4.0.15" From d245d247c96b9b8dab23e179e6d573f0c602d986 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Wed, 25 Sep 2024 22:38:11 +0800 Subject: [PATCH 02/22] Update app.ts --- apps/desktop/src-electron/app.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index 35018b9127c..c53a1c60dc2 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -523,7 +523,6 @@ function createMainWindow() { if (error) { resolve(true); } else { - result = !!result; resolve(status === UserConsentVerifierAvailability.available); } }, From 623ee6ed4df932793e07c6cc92c3b41161a098dd Mon Sep 17 00:00:00 2001 From: huhuanming Date: Wed, 25 Sep 2024 22:41:37 +0800 Subject: [PATCH 03/22] Update app.ts --- apps/desktop/src-electron/app.ts | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index c53a1c60dc2..c6a28bcb9d7 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -19,6 +19,7 @@ import contextMenu from 'electron-context-menu'; import isDev from 'electron-is-dev'; import logger from 'electron-log/main'; import windowsSecurityCredentialsUiModule, { + UserConsentVerificationResult, UserConsentVerifierAvailability, } from 'windows.security.credentials.ui'; @@ -515,9 +516,8 @@ function createMainWindow() { }); ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, async (event) => { - let result = !!systemPreferences?.canPromptTouchID?.(); - if (!result && isWin) { - result = await new Promise((resolve) => { + if (isWin) { + const result = await new Promise((resolve) => { windowsSecurityCredentialsUiModule.UserConsentVerifier.checkAvailabilityAsync( (error, status) => { if (error) { @@ -528,8 +528,11 @@ function createMainWindow() { }, ); }); + event.returnValue = result; + return; } - event.returnValue = result; + const result = systemPreferences?.canPromptTouchID?.(); + event.returnValue = !!result; }); ipcMain.on(ipcMessageKeys.APP_GET_ENV_PATH, (event) => { @@ -571,6 +574,24 @@ function createMainWindow() { }); ipcMain.on(ipcMessageKeys.TOUCH_ID_PROMPT, async (event, msg: string) => { + if (isWin) { + windowsSecurityCredentialsUiModule.UserConsentVerifier.requestVerificationAsync( + msg, + (error, status) => { + if (error) { + event.reply(ipcMessageKeys.TOUCH_ID_PROMPT_RES, { + success: false, + error: error.message, + }); + } else { + event.reply(ipcMessageKeys.TOUCH_ID_PROMPT_RES, { + success: status === UserConsentVerificationResult.verified, + }); + } + }, + ); + return; + } try { await systemPreferences.promptTouchID(msg); event.reply(ipcMessageKeys.TOUCH_ID_PROMPT_RES, { success: true }); From db20ac5753ce08edbbbd9bc59e003004f60212cd Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:03:03 +0800 Subject: [PATCH 04/22] Update package.json --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 51c2ce0f5ec..deb31d95743 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" }, "devDependencies": { "@electron/notarize": "^2.3.0", From a0e63ea3ba5b536b11ec9d04f1bf51394c17eb79 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:03:10 +0800 Subject: [PATCH 05/22] Update yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index d4aa42cdaf9..884f29af294 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#08c7c97410b0fce97cc6aeb2f50d599db6034fcd": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=08c7c97410b0fce97cc6aeb2f50d599db6034fcd" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" dependencies: nan: "npm:latest" - checksum: 10/ae58183cf173de9de6ebbfc3a0435bc95ac45ac828e097e5ce0996ffec5236b085c9cb46549418fdfe5a5194d660592e9a751edc8322f125528d83dc8e67ffb3 + checksum: 10/42c75a8f122e8aada70a658a93cbc3cb469fc27ab0fc9fb5bae489847f18a92a88c82d60daf2a22b6794077d7ec59c0d6ee91c0dafa00c5d13ef121161f01274 languageName: node linkType: hard From 4db2179a0b9476373e6477db1c3ff5277dba2f5a Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:29:10 +0800 Subject: [PATCH 06/22] support arm64 --- apps/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index deb31d95743..0829c067b95 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 884f29af294..2d1e7c173ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#d2280c8bdbadefc254a0b95dd02f11de2b2e8aea": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=d2280c8bdbadefc254a0b95dd02f11de2b2e8aea" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=f1d641b3e46dfdaa1122234a8e5423b849fff255" dependencies: nan: "npm:latest" - checksum: 10/42c75a8f122e8aada70a658a93cbc3cb469fc27ab0fc9fb5bae489847f18a92a88c82d60daf2a22b6794077d7ec59c0d6ee91c0dafa00c5d13ef121161f01274 + checksum: 10/1249cac66bb27322c6ceb27df1a87d2080e2031be56b29be183f0261fce2cd73f9cde25fb08d1d2b137709c5691d43f89ebeae96a0718b8997b36bd328605542 languageName: node linkType: hard From 714f39a5f01e18abb935bf8f834a3e206373adb4 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:29:16 +0800 Subject: [PATCH 07/22] lazy load --- apps/desktop/src-electron/app.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index c6a28bcb9d7..530f083f7ca 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -18,10 +18,6 @@ import { import contextMenu from 'electron-context-menu'; import isDev from 'electron-is-dev'; import logger from 'electron-log/main'; -import windowsSecurityCredentialsUiModule, { - UserConsentVerificationResult, - UserConsentVerifierAvailability, -} from 'windows.security.credentials.ui'; import { ONEKEY_APP_DEEP_LINK_NAME, @@ -518,12 +514,18 @@ function createMainWindow() { ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, async (event) => { if (isWin) { const result = await new Promise((resolve) => { + const windowsSecurityCredentialsUiModule = + require('windows.security.credentials.ui') as typeof import('windows.security.credentials.ui'); windowsSecurityCredentialsUiModule.UserConsentVerifier.checkAvailabilityAsync( (error, status) => { if (error) { resolve(true); } else { - resolve(status === UserConsentVerifierAvailability.available); + resolve( + status === + windowsSecurityCredentialsUiModule + .UserConsentVerifierAvailability.available, + ); } }, ); @@ -575,6 +577,8 @@ function createMainWindow() { ipcMain.on(ipcMessageKeys.TOUCH_ID_PROMPT, async (event, msg: string) => { if (isWin) { + const windowsSecurityCredentialsUiModule = + require('windows.security.credentials.ui') as typeof import('windows.security.credentials.ui'); windowsSecurityCredentialsUiModule.UserConsentVerifier.requestVerificationAsync( msg, (error, status) => { @@ -585,7 +589,10 @@ function createMainWindow() { }); } else { event.reply(ipcMessageKeys.TOUCH_ID_PROMPT_RES, { - success: status === UserConsentVerificationResult.verified, + success: + status === + windowsSecurityCredentialsUiModule.UserConsentVerificationResult + .verified, }); } }, From cdc5a1dbb0a89e021c9d49b5ba5ebcb369867d8a Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:42:08 +0800 Subject: [PATCH 08/22] fix ci --- apps/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 0829c067b95..03740027c60 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 2d1e7c173ac..e17435e5a26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#f1d641b3e46dfdaa1122234a8e5423b849fff255": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=f1d641b3e46dfdaa1122234a8e5423b849fff255" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=367fcae89f16974738ae6cce23d2458491219d50" dependencies: nan: "npm:latest" - checksum: 10/1249cac66bb27322c6ceb27df1a87d2080e2031be56b29be183f0261fce2cd73f9cde25fb08d1d2b137709c5691d43f89ebeae96a0718b8997b36bd328605542 + checksum: 10/129b53e391067f6809c3a180a208db9ba18d7a79ebb47e6ee7a8165d24c0c3cb233cb632fecee0504c86c3a98e3f818ddabe2f077c7dc0c95ca6f1b65f81ff0f languageName: node linkType: hard From 5fa12b34e85fca2d30af45c3356f2452a5231c13 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:45:51 +0800 Subject: [PATCH 09/22] Update package.json --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 03740027c60..c820a7542b4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -11,7 +11,7 @@ "clean": "rimraf ./build-electron && rimraf .tamagui && rimraf ./build && rimraf ./dist && rimraf __generated__", "clean:build": "rimraf ./build-electron && rimraf ./build && rimraf ./dist && rimraf ./node_modules/.cache", "start": "yarn dev", - "dev": "yarn keytar && npx concurrently \"yarn dev:main\" \"yarn dev:renderer\" \"cross-env LAUNCH_ELECTRON=true node scripts/dev.js\"", + "dev": "yarn keytar && npx concurrently \"yarn build:main\" \"yarn dev:renderer\" \"cross-env LAUNCH_ELECTRON=true node scripts/dev.js\"", "dev:main": "electron --inspect=5858 dist/app.js", "dev:renderer": "TRANSFORM_REGENERATOR_DISABLED=true BROWSER=none WEB_PORT=3001 webpack serve", "build:main": "rimraf ./dist && cross-env NODE_ENV=production node scripts/build.js", From be77c5ef56ee2bcaf806beb005511c350895d767 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:51:59 +0800 Subject: [PATCH 10/22] Revert "lazy load" This reverts commit 714f39a5f01e18abb935bf8f834a3e206373adb4. --- apps/desktop/src-electron/app.ts | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index 530f083f7ca..c6a28bcb9d7 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -18,6 +18,10 @@ import { import contextMenu from 'electron-context-menu'; import isDev from 'electron-is-dev'; import logger from 'electron-log/main'; +import windowsSecurityCredentialsUiModule, { + UserConsentVerificationResult, + UserConsentVerifierAvailability, +} from 'windows.security.credentials.ui'; import { ONEKEY_APP_DEEP_LINK_NAME, @@ -514,18 +518,12 @@ function createMainWindow() { ipcMain.on(ipcMessageKeys.TOUCH_ID_CAN_PROMPT, async (event) => { if (isWin) { const result = await new Promise((resolve) => { - const windowsSecurityCredentialsUiModule = - require('windows.security.credentials.ui') as typeof import('windows.security.credentials.ui'); windowsSecurityCredentialsUiModule.UserConsentVerifier.checkAvailabilityAsync( (error, status) => { if (error) { resolve(true); } else { - resolve( - status === - windowsSecurityCredentialsUiModule - .UserConsentVerifierAvailability.available, - ); + resolve(status === UserConsentVerifierAvailability.available); } }, ); @@ -577,8 +575,6 @@ function createMainWindow() { ipcMain.on(ipcMessageKeys.TOUCH_ID_PROMPT, async (event, msg: string) => { if (isWin) { - const windowsSecurityCredentialsUiModule = - require('windows.security.credentials.ui') as typeof import('windows.security.credentials.ui'); windowsSecurityCredentialsUiModule.UserConsentVerifier.requestVerificationAsync( msg, (error, status) => { @@ -589,10 +585,7 @@ function createMainWindow() { }); } else { event.reply(ipcMessageKeys.TOUCH_ID_PROMPT_RES, { - success: - status === - windowsSecurityCredentialsUiModule.UserConsentVerificationResult - .verified, + success: status === UserConsentVerificationResult.verified, }); } }, From ff10b1d942a6c31f20fbe24acbbfec3d28e0e246 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:52:58 +0800 Subject: [PATCH 11/22] Update package.json --- apps/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index c820a7542b4..431b6436f2a 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78" }, "devDependencies": { "@electron/notarize": "^2.3.0", From cbede3dc0490dcf919102221668bbb61aea29ed4 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:53:13 +0800 Subject: [PATCH 12/22] Update yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index e17435e5a26..591803c9b42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#367fcae89f16974738ae6cce23d2458491219d50": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=367fcae89f16974738ae6cce23d2458491219d50" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=91c3534a1b520ea1a78319e63ba2d84b19c37e78" dependencies: nan: "npm:latest" - checksum: 10/129b53e391067f6809c3a180a208db9ba18d7a79ebb47e6ee7a8165d24c0c3cb233cb632fecee0504c86c3a98e3f818ddabe2f077c7dc0c95ca6f1b65f81ff0f + checksum: 10/d6c487953945337dd3f432222e5320b2ae6ad8b3e10d3246b261a11fd84e427297cd22a72b61ffcea36179fd5944b42b10a4aa4bdb01aa87e63844fb467a4e20 languageName: node linkType: hard From 0d0571a3652f72f2f58b29da69a78c757ec8e678 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 00:57:50 +0800 Subject: [PATCH 13/22] Update app.ts --- apps/desktop/src-electron/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index c6a28bcb9d7..95be95cdc3a 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -521,7 +521,7 @@ function createMainWindow() { windowsSecurityCredentialsUiModule.UserConsentVerifier.checkAvailabilityAsync( (error, status) => { if (error) { - resolve(true); + resolve(false); } else { resolve(status === UserConsentVerifierAvailability.available); } From 7d21421bb2b6427f2feb3fe43cdfacf2c7eb10de Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 09:34:25 +0800 Subject: [PATCH 14/22] fix missing arm64 binding.node --- apps/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 431b6436f2a..502a33ebb4c 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 591803c9b42..8fa2be75480 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#91c3534a1b520ea1a78319e63ba2d84b19c37e78": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=91c3534a1b520ea1a78319e63ba2d84b19c37e78" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=d381b185b3e1eb7388f81971d443dc80a7ae0fc0" dependencies: nan: "npm:latest" - checksum: 10/d6c487953945337dd3f432222e5320b2ae6ad8b3e10d3246b261a11fd84e427297cd22a72b61ffcea36179fd5944b42b10a4aa4bdb01aa87e63844fb467a4e20 + checksum: 10/d3b5c8e8cb2f44584fd0ac27f6499daa8fb3a096746cb9faee5664675907aadfe282140c8a22634b4ec97e53275893f2fce7c3c10c551452cefdce2704cb34d4 languageName: node linkType: hard From 2ec535ace2ce09250d85d79c3cd1974faa39ac9e Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 09:51:03 +0800 Subject: [PATCH 15/22] Update app.ts --- apps/desktop/src-electron/app.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index 95be95cdc3a..6e0e01926c7 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -46,6 +46,7 @@ import { parseContentPList } from './libs/utils'; import initProcess, { restartBridge } from './process'; logger.initialize(); +logger.transports.file.maxSize = 1024 * 1024 * 10; // https://github.com/sindresorhus/electron-context-menu const disposeContextMenu = contextMenu({ From 797ade0f56b0d2d980dc97c96604bfcaa4860a83 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 10:15:01 +0800 Subject: [PATCH 16/22] upgrade windows.security.credentials.ui --- apps/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 502a33ebb4c..9d23394e2dc 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 8fa2be75480..53cbebe991b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#d381b185b3e1eb7388f81971d443dc80a7ae0fc0": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=d381b185b3e1eb7388f81971d443dc80a7ae0fc0" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=9fab735609562484c925eb34ab6b09f7fb1af13a" dependencies: nan: "npm:latest" - checksum: 10/d3b5c8e8cb2f44584fd0ac27f6499daa8fb3a096746cb9faee5664675907aadfe282140c8a22634b4ec97e53275893f2fce7c3c10c551452cefdce2704cb34d4 + checksum: 10/72c4b281de164f44ea9f0a0b4c925a7ac5ed80a8ee384e6486050b49ec2e74b9754bdbd68903269d6f7803d405fe1fa28e5f23ec25753846bebd915b1bdfd585 languageName: node linkType: hard From 9f602f7f04ac528820b1b482d6a944e979bbe18a Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 11:15:54 +0800 Subject: [PATCH 17/22] remove arm64 --- apps/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 9d23394e2dc..c542ddf3195 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -41,7 +41,7 @@ "electron-updater": "6.1.8", "keytar": "^7.9.0", "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a" + "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 53cbebe991b..61d5d34b270 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6695,7 +6695,7 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a" + windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a" languageName: unknown linkType: soft @@ -38231,12 +38231,12 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#9fab735609562484c925eb34ab6b09f7fb1af13a": +"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a": version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=9fab735609562484c925eb34ab6b09f7fb1af13a" + resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=373763ab6577977687d72bde7af8aabf3220f98a" dependencies: nan: "npm:latest" - checksum: 10/72c4b281de164f44ea9f0a0b4c925a7ac5ed80a8ee384e6486050b49ec2e74b9754bdbd68903269d6f7803d405fe1fa28e5f23ec25753846bebd915b1bdfd585 + checksum: 10/9d5efafce3e403cd36915a9bc89bbccc13b8b63dcd41d8262aa91bb3f597a987148b95f4f87cfdcee683b4f3e9c20112b95fb11c5337ca1650de4a2b01f1bd97 languageName: node linkType: hard From e563314f2ca79de584ba3c9351007fd1a9eee852 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 15:14:13 +0800 Subject: [PATCH 18/22] fix icon & text --- packages/components/src/primitives/Icon/Icons.tsx | 1 + .../primitives/Icon/react/solid/WindowsHello.tsx | 15 +++++++++++++++ .../src/primitives/Icon/react/solid/index.ts | 1 + packages/components/svg/solid/windows-hello.svg | 5 +++++ .../Setting/pages/List/SecuritySection/index.tsx | 3 +++ packages/shared/src/locale/enum/translations.ts | 7 +++++++ packages/shared/src/locale/json/bn.json | 7 +++++++ packages/shared/src/locale/json/de.json | 7 +++++++ packages/shared/src/locale/json/en.json | 7 +++++++ packages/shared/src/locale/json/en_US.json | 7 +++++++ packages/shared/src/locale/json/es.json | 7 +++++++ packages/shared/src/locale/json/fr_FR.json | 7 +++++++ packages/shared/src/locale/json/hi_IN.json | 7 +++++++ packages/shared/src/locale/json/id.json | 7 +++++++ packages/shared/src/locale/json/it_IT.json | 7 +++++++ packages/shared/src/locale/json/ja_JP.json | 7 +++++++ packages/shared/src/locale/json/ko_KR.json | 7 +++++++ packages/shared/src/locale/json/pt.json | 7 +++++++ packages/shared/src/locale/json/pt_BR.json | 7 +++++++ packages/shared/src/locale/json/ru.json | 7 +++++++ packages/shared/src/locale/json/th_TH.json | 7 +++++++ packages/shared/src/locale/json/uk_UA.json | 7 +++++++ packages/shared/src/locale/json/vi.json | 7 +++++++ packages/shared/src/locale/json/zh_CN.json | 7 +++++++ packages/shared/src/locale/json/zh_HK.json | 7 +++++++ packages/shared/src/locale/json/zh_TW.json | 7 +++++++ 26 files changed, 172 insertions(+) create mode 100644 packages/components/src/primitives/Icon/react/solid/WindowsHello.tsx create mode 100644 packages/components/svg/solid/windows-hello.svg diff --git a/packages/components/src/primitives/Icon/Icons.tsx b/packages/components/src/primitives/Icon/Icons.tsx index 066fcbcd434..53d87de5325 100644 --- a/packages/components/src/primitives/Icon/Icons.tsx +++ b/packages/components/src/primitives/Icon/Icons.tsx @@ -1930,6 +1930,7 @@ const icons = { WhisperSolid: () => import("./react/solid/Whisper"), WifiSolid: () => import("./react/solid/Wifi"), WindSolid: () => import("./react/solid/Wind"), + WindowsHelloSolid: () => import("./react/solid/WindowsHello"), WorldSolid: () => import("./react/solid/World"), WreathSolid: () => import("./react/solid/Wreath"), XBackspaceSolid: () => import("./react/solid/XBackspace"), diff --git a/packages/components/src/primitives/Icon/react/solid/WindowsHello.tsx b/packages/components/src/primitives/Icon/react/solid/WindowsHello.tsx new file mode 100644 index 00000000000..1cd9160483a --- /dev/null +++ b/packages/components/src/primitives/Icon/react/solid/WindowsHello.tsx @@ -0,0 +1,15 @@ +import Svg, { SvgProps, Path, Circle } from 'react-native-svg'; +const SvgWindowsHello = (props: SvgProps) => ( + + + + + +); +export default SvgWindowsHello; diff --git a/packages/components/src/primitives/Icon/react/solid/index.ts b/packages/components/src/primitives/Icon/react/solid/index.ts index 5bd610d16e5..5595b94b070 100644 --- a/packages/components/src/primitives/Icon/react/solid/index.ts +++ b/packages/components/src/primitives/Icon/react/solid/index.ts @@ -768,6 +768,7 @@ export { default as Webcam } from './Webcam'; export { default as Whisper } from './Whisper'; export { default as Wifi } from './Wifi'; export { default as Wind } from './Wind'; +export { default as WindowsHello } from './WindowsHello'; export { default as World } from './World'; export { default as Wreath } from './Wreath'; export { default as XBackspace } from './XBackspace'; diff --git a/packages/components/svg/solid/windows-hello.svg b/packages/components/svg/solid/windows-hello.svg new file mode 100644 index 00000000000..77f949dd559 --- /dev/null +++ b/packages/components/svg/solid/windows-hello.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/kit/src/views/Setting/pages/List/SecuritySection/index.tsx b/packages/kit/src/views/Setting/pages/List/SecuritySection/index.tsx index 0a7d415baf6..137181f6f95 100644 --- a/packages/kit/src/views/Setting/pages/List/SecuritySection/index.tsx +++ b/packages/kit/src/views/Setting/pages/List/SecuritySection/index.tsx @@ -132,6 +132,9 @@ const FaceIdItem = () => { : ETranslations.global_face_id, }); icon = 'FaceIdSolid'; + } else if (platformEnv.isDesktopWin) { + title = intl.formatMessage({ id: ETranslations.global_windows_hello }); + icon = 'WindowsHelloSolid'; } } diff --git a/packages/shared/src/locale/enum/translations.ts b/packages/shared/src/locale/enum/translations.ts index 899b2b4b637..c6ad9ddc37e 100644 --- a/packages/shared/src/locale/enum/translations.ts +++ b/packages/shared/src/locale/enum/translations.ts @@ -403,6 +403,7 @@ earn_request_withdrawal_steth_desc = 'earn.request_withdrawal_steth_desc', earn_request_withdrawal_stmatic_desc = 'earn.request_withdrawal_stmatic_desc', earn_reward_tokens = 'earn.reward_tokens', + earn_reward_value = 'earn.reward_value', earn_rewards = 'earn.rewards', earn_rewards_automatically_restaked = 'earn.rewards_automatically_restaked', earn_rewards_manually_restaked = 'earn.rewards_manually_restaked', @@ -433,6 +434,9 @@ earn_token_is_pending = 'earn.token_is_pending', earn_token_is_staked = 'earn.token_is_staked', earn_total_staked_value = 'earn.total_staked_value', + earn_transaction_loss = 'earn.transaction_loss', + earn_transaction_loss_when_claim = 'earn.transaction_loss_when_claim', + earn_transaction_loss_when_stake = 'earn.transaction_loss_when_stake', earn_tvl = 'earn.tvl', earn_unlock_time = 'earn.unlock_time', earn_unstake_all_due_to_min_withdrawal = 'earn.unstake_all_due_to_min_withdrawal', @@ -683,6 +687,8 @@ form__approve_str = 'form__approve_str', form__priority_fee = 'form__priority_fee', form__sats__units = 'form__sats__units', + global_windows_hello = 'global.windows_hello', + global_windows_hello_set_error = 'global.windows_hello_set_error', global_404_message = 'global.404_message', global_Note = 'global.Note', global_about = 'global.about', @@ -1696,6 +1702,7 @@ swap_page_button_refresh_quotes = 'swap_page.button_refresh_quotes', swap_page_button_select_token = 'swap_page.button_select_token', swap_page_button_wrap = 'swap_page.button_wrap', + swap_page_buy_sell_tax = 'swap_page.buy_sell_tax', swap_page_from = 'swap_page.from', swap_page_limit = 'swap_page.limit', swap_page_limit_dialog_button = 'swap_page.limit_dialog_button', diff --git a/packages/shared/src/locale/json/bn.json b/packages/shared/src/locale/json/bn.json index 25dd8186678..ee952b94ff5 100644 --- a/packages/shared/src/locale/json/bn.json +++ b/packages/shared/src/locale/json/bn.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "একটি উত্তোলন অনুরোধ প্রেরণ করে আপনার stETH/wstETH লক করুন। 1-4 দিনের মধ্যে, লককৃত stETH ধ্বংস হবে এবং আপনার ETH উত্তোলনের জন্য উপলব্ধ হবে।", "earn.request_withdrawal_stmatic_desc": "উত্তোলন অনুরোধ প্রেরণ করার 1-4 দিনের মধ্যে, লক করা stMATIC ধ্বংস হবে এবং আপনার MATIC উত্তোলনের জন্য উপলব্ধ হবে।", "earn.reward_tokens": "পুরস্কার টোকেন", + "earn.reward_value": "পুরস্কার মান", "earn.rewards": "পুরস্কার", "earn.rewards_automatically_restaked": "পুরস্কারগুলি {automatically} পুনরায় স্টেক করা হয়, যা আপনার স্টেকড বডির বৃদ্ধি করে", "earn.rewards_manually_restaked": "পুরস্কারগুলি কে {manually} প্রত্যাহার এবং পুনরায় স্থাপন করা প্রয়োজন", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} অপেক্ষামান", "earn.token_is_staked": "{token} স্টেক করা হয়েছে", "earn.total_staked_value": "মোট স্টেকের মান", + "earn.transaction_loss": "লেনদেন ক্ষতি", + "earn.transaction_loss_when_claim": "আপনার পুরস্কারের চেয়ে নেটওয়ার্ক ফি বেশি হওয়ার কারণে, এই লেনদেনটি {number} ক্ষতির ফলাফল হবে।", + "earn.transaction_loss_when_stake": "বর্তমান আনুমানিক হারের ভিত্তিতে, আপনার উপার্জন ক্ষতি পূরণ করতে প্রায় {number} দিন সময় লাগবে।", "earn.tvl": "TVL", "earn.unlock_time": "আনলক সময়", "earn.unstake_all_due_to_min_withdrawal": "ন্যূনতম প্রত্যাহার পরিমাণ {number} {symbol} এর কারণে, এই লেনদেনটি পরবর্তী প্রত্যাহারের জন্য অপর্যাপ্ত তহবিল এড়াতে সমস্ত সম্পদকে মুক্ত করবে৷", @@ -678,6 +682,8 @@ "form__approve_str": "{amount} {symbol} অনুমোদন করুন", "form__priority_fee": "অগ্রাধিকার ফি", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Windows Hello সেট করুন ব্যর্থ", "global.404_message": "দুঃখিত, কিছু ভুল হয়েছে!", "global.Note": "নোট", "global.about": "সম্পর্কে", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "উদ্ধৃতি রিফ্রেশ করুন", "swap_page.button_select_token": "টোকেন নির্বাচন করুন", "swap_page.button_wrap": "ওয়্যাপ চুক্তির মাধ্যমে অদলবদল করুন", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "থেকে", "swap_page.limit": "সীমা", "swap_page.limit_dialog_button": "নিশ্চিত করুন", diff --git a/packages/shared/src/locale/json/de.json b/packages/shared/src/locale/json/de.json index b98b53adc66..2dac5c941a8 100644 --- a/packages/shared/src/locale/json/de.json +++ b/packages/shared/src/locale/json/de.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Schließen Sie Ihre stETH/wstETH durch eine Auszahlungsanforderung ab. Nach 1-4 Tagen wird das gesperrte stETH zerstört und Ihr ETH steht zur Auszahlung bereit.", "earn.request_withdrawal_stmatic_desc": "1-4 Tage nach der Ausstellung einer Auszahlungsanforderung wird das gesperrte stMATIC zerstört und Ihr MATIC wird zur Auszahlung verfügbar.", "earn.reward_tokens": "Belohnungstoken", + "earn.reward_value": "Belohnungswert", "earn.rewards": "Belohnungen", "earn.rewards_automatically_restaked": "Belohnungen werden {automatically} neu gestaked, wodurch Ihr gestaked Body erhöht wird", "earn.rewards_manually_restaked": "Belohnungen müssen {manually} abgehoben und erneut eingesetzt werden", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} steht aus", "earn.token_is_staked": "{token} ist eingesetzt", "earn.total_staked_value": "Gesamtwert des Stakings", + "earn.transaction_loss": "Transaktionsverlust", + "earn.transaction_loss_when_claim": "Da die geschätzte Netzwerkgebühr Ihre Belohnungen übersteigt, wird diese Transaktion zu einem Verlust von {number} führen.", + "earn.transaction_loss_when_stake": "Basierend auf der aktuellen geschätzten Rate wird es etwa {number} Tage dauern, bis Ihre Einnahmen die Verluste decken.", "earn.tvl": "TVL", "earn.unlock_time": "Entsperrzeit", "earn.unstake_all_due_to_min_withdrawal": "Aufgrund des Mindestauszahlungsbetrags von {number} {symbol} werden bei dieser Transaktion alle Vermögenswerte aufgehoben, um zu vermeiden, dass bei der nächsten Auszahlung nicht genügend Geld vorhanden ist.", @@ -678,6 +682,8 @@ "form__approve_str": "Genehmigen Sie {amount} {symbol}", "form__priority_fee": "Prioritätsgebühr", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Windows Hello-Fehler festlegen", "global.404_message": "Entschuldigung, etwas ist schief gelaufen!", "global.Note": "Hinweis", "global.about": "Über", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Zitate aktualisieren", "swap_page.button_select_token": "Token auswählen", "swap_page.button_wrap": "Austausch über Wrap-Vertrag", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "Von", "swap_page.limit": "Grenze", "swap_page.limit_dialog_button": "Bestätigen", diff --git a/packages/shared/src/locale/json/en.json b/packages/shared/src/locale/json/en.json index 7c419cd49f9..9078e279c62 100644 --- a/packages/shared/src/locale/json/en.json +++ b/packages/shared/src/locale/json/en.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Lock your stETH/wstETH by issuing a withdrawal request. After 1-4 days, the locked stETH will be destroyed and your ETH will become available for withdrawal.", "earn.request_withdrawal_stmatic_desc": "1-4 days after issuing a withdrawal request, the locked stMATIC will be destroyed and your MATIC will become available for withdrawal.", "earn.reward_tokens": "Reward tokens", + "earn.reward_value": "Reward value", "earn.rewards": "Rewards", "earn.rewards_automatically_restaked": "Rewards are {automatically} restaked, increasing your staked body", "earn.rewards_manually_restaked": "Rewards need to be {manually} withdrawn and restaked", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} is pending", "earn.token_is_staked": "{token} is staked", "earn.total_staked_value": "Total staked value", + "earn.transaction_loss": "Transaction loss", + "earn.transaction_loss_when_claim": "Due to the est network fee exceeding your rewards, this transaction will result in a loss of {number}.", + "earn.transaction_loss_when_stake": "Based on the current estimated rate, it will take about {number} days for your earnings to cover the losses.", "earn.tvl": "TVL", "earn.unlock_time": "Unlock time", "earn.unstake_all_due_to_min_withdrawal": "Due to the minimum withdrawal amount of {number} {symbol}, this transaction will unstake all assets to avoid insufficient funds for the next withdrawal.", @@ -678,6 +682,8 @@ "form__approve_str": "Approve {amount} {symbol}", "form__priority_fee": "Priority fee", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Set Windows Hello to fail", "global.404_message": "Sorry, something went wrong!", "global.Note": "Note", "global.about": "About", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Refresh quotes", "swap_page.button_select_token": "Select token", "swap_page.button_wrap": "Swap via Wrap Contract", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "From", "swap_page.limit": "Limit", "swap_page.limit_dialog_button": "Confirm", diff --git a/packages/shared/src/locale/json/en_US.json b/packages/shared/src/locale/json/en_US.json index 593e1df71fa..d85d7e0976d 100644 --- a/packages/shared/src/locale/json/en_US.json +++ b/packages/shared/src/locale/json/en_US.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Lock your stETH/wstETH by issuing a withdrawal request. After 1-4 days, the locked stETH will be destroyed and your ETH will become available for withdrawal.", "earn.request_withdrawal_stmatic_desc": "1-4 days after issuing a withdrawal request, the locked stMATIC will be destroyed and your MATIC will become available for withdrawal.", "earn.reward_tokens": "Reward tokens", + "earn.reward_value": "Reward value", "earn.rewards": "Rewards", "earn.rewards_automatically_restaked": "Rewards are {automatically} restaked, increasing your staked body", "earn.rewards_manually_restaked": "Rewards need to be {manually} withdrawn and restaked", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} is pending", "earn.token_is_staked": "{token} is staked", "earn.total_staked_value": "Total staked value", + "earn.transaction_loss": "Transaction loss", + "earn.transaction_loss_when_claim": "Due to the est network fee exceeding your rewards, this transaction will result in a loss of {number}.", + "earn.transaction_loss_when_stake": "Based on the current estimated rate, it will take about {number} days for your earnings to cover the losses.", "earn.tvl": "TVL", "earn.unlock_time": "Unlock time", "earn.unstake_all_due_to_min_withdrawal": "Due to the minimum withdrawal amount of {number} {symbol}, this transaction will unstake all assets to avoid insufficient funds for the next withdrawal.", @@ -678,6 +682,8 @@ "form__approve_str": "Approve {amount} {symbol}", "form__priority_fee": "Priority fee", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Set Windows Hello fail", "global.404_message": "Sorry, something went wrong!", "global.Note": "Note", "global.about": "About", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Refresh quotes", "swap_page.button_select_token": "Select token", "swap_page.button_wrap": "Swap via Wrap Contract", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "From", "swap_page.limit": "Limit", "swap_page.limit_dialog_button": "Confirm", diff --git a/packages/shared/src/locale/json/es.json b/packages/shared/src/locale/json/es.json index e99db35e326..2e10c1bcc08 100644 --- a/packages/shared/src/locale/json/es.json +++ b/packages/shared/src/locale/json/es.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Bloquee su stETH/wstETH emitiendo una solicitud de retiro. Después de 1-4 días, el stETH bloqueado será destruido y su ETH estará disponible para retiro.", "earn.request_withdrawal_stmatic_desc": "1-4 días después de emitir una solicitud de retiro, el stMATIC bloqueado será destruido y tu MATIC estará disponible para retirar.", "earn.reward_tokens": "Recompensas en tokens", + "earn.reward_value": "Valor de la recompensa", "earn.rewards": "Recompensas", "earn.rewards_automatically_restaked": "Las recompensas se {automatically} reinvierten, aumentando tu cuerpo apostado", "earn.rewards_manually_restaked": "Las recompensas necesitan ser {manually} retiradas y reinvertidas", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} está pendiente", "earn.token_is_staked": "{token} está apostado", "earn.total_staked_value": "Valor total apostado", + "earn.transaction_loss": "Pérdida de transacción", + "earn.transaction_loss_when_claim": "Debido a que la tarifa de red estimada supera tus recompensas, esta transacción resultará en una pérdida de {number}.", + "earn.transaction_loss_when_stake": "Según la tasa estimada actual, tomará alrededor de {number} días para que tus ganancias cubran las pérdidas.", "earn.tvl": "TVL", "earn.unlock_time": "Tiempo de desbloqueo", "earn.unstake_all_due_to_min_withdrawal": "Debido al monto mínimo de retiro de {number} {symbol} , esta transacción liberará todos los activos para evitar fondos insuficientes para el próximo retiro.", @@ -678,6 +682,8 @@ "form__approve_str": "Aprobar {amount} {symbol}", "form__priority_fee": "Tarifa Prioritaria", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Error al configurar Windows Hello", "global.404_message": "¡Lo siento, algo salió mal!", "global.Note": "Nota", "global.about": "Acerca de", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Actualizar cotizaciones", "swap_page.button_select_token": "Seleccionar token", "swap_page.button_wrap": "Intercambio a través del Contrato Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "De", "swap_page.limit": "Límite", "swap_page.limit_dialog_button": "Confirmar", diff --git a/packages/shared/src/locale/json/fr_FR.json b/packages/shared/src/locale/json/fr_FR.json index c4d67db5bc0..82551803f42 100644 --- a/packages/shared/src/locale/json/fr_FR.json +++ b/packages/shared/src/locale/json/fr_FR.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Verrouillez votre stETH/wstETH en émettant une demande de retrait. Après 1 à 4 jours, le stETH verrouillé sera détruit et votre ETH deviendra disponible pour le retrait.", "earn.request_withdrawal_stmatic_desc": "1 à 4 jours après avoir émis une demande de retrait, le stMATIC verrouillé sera détruit et vos MATIC deviendront disponibles pour le retrait.", "earn.reward_tokens": "Jetons de récompense", + "earn.reward_value": "Valeur de la récompense", "earn.rewards": "Récompenses", "earn.rewards_automatically_restaked": "Les récompenses sont {automatically} réinvesties, augmentant votre corps misé", "earn.rewards_manually_restaked": "Les récompenses doivent être {manually} retirées et remises en jeu", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} est en attente", "earn.token_is_staked": "{token} est mis en jeu", "earn.total_staked_value": "Valeur totale jalonnée", + "earn.transaction_loss": "Perte de transaction", + "earn.transaction_loss_when_claim": "En raison des frais de réseau estimés dépassant vos récompenses, cette transaction entraînera une perte de {number}.", + "earn.transaction_loss_when_stake": "Selon le taux estimé actuel, il faudra environ {number} jours pour que vos gains couvrent les pertes.", "earn.tvl": "TVL", "earn.unlock_time": "Temps de déverrouillage", "earn.unstake_all_due_to_min_withdrawal": "En raison du montant minimum de retrait de {number} {symbol} , cette transaction retirera tous les actifs pour éviter des fonds insuffisants pour le prochain retrait.", @@ -678,6 +682,8 @@ "form__approve_str": "Approuver {amount} {symbol}", "form__priority_fee": "Frais de priorité", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Échec de configuration de Windows Hello", "global.404_message": "Désolé, quelque chose a mal tourné !", "global.Note": "Note", "global.about": "À propos", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Actualiser les citations", "swap_page.button_select_token": "Sélectionnez le jeton", "swap_page.button_wrap": "Échange via le contrat Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "De", "swap_page.limit": "Limite", "swap_page.limit_dialog_button": "Confirmer", diff --git a/packages/shared/src/locale/json/hi_IN.json b/packages/shared/src/locale/json/hi_IN.json index 4d4c659cac2..183aa3271a1 100644 --- a/packages/shared/src/locale/json/hi_IN.json +++ b/packages/shared/src/locale/json/hi_IN.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "एक विनियोग अनुरोध जारी करके अपने stETH/wstETH को लॉक करें। 1-4 दिनों के बाद, लॉक किए गए stETH को नष्ट कर दिया जाएगा और आपके ETH को वापसी के लिए उपलब्ध कराया जाएगा।", "earn.request_withdrawal_stmatic_desc": "विनियोग अनुरोध जारी करने के 1-4 दिनों के बाद, लॉक्ड stMATIC नष्ट कर दिया जाएगा और आपका MATIC वापसी के लिए उपलब्ध हो जाएगा।", "earn.reward_tokens": "पुरस्कार टोकन", + "earn.reward_value": "पुरस्कार मूल्य", "earn.rewards": "पुरस्कार", "earn.rewards_automatically_restaked": "पुरस्कार {automatically} पुनः स्टेक किए जाते हैं, जिससे आपका स्टेक किया हुआ शरीर बढ़ जाता है", "earn.rewards_manually_restaked": "पुरस्कारों को {manually} निकालकर और फिर से डालना होगा", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} अभी बाकी है", "earn.token_is_staked": "{token} बांध दिया गया है", "earn.total_staked_value": "कुल स्टेक्ड मूल्य", + "earn.transaction_loss": "लेन-देन की हानि", + "earn.transaction_loss_when_claim": "चूंकि अनुमानित नेटवर्क शुल्क आपके पुरस्कारों से अधिक है, इस लेन-देन से {number} का नुकसान होगा।", + "earn.transaction_loss_when_stake": "वर्तमान अनुमानित दर के आधार पर, आपके नुकसान की भरपाई करने में लगभग {number} दिन लगेंगे।", "earn.tvl": "TVL", "earn.unlock_time": "अनलॉक समय", "earn.unstake_all_due_to_min_withdrawal": "{number} {symbol} की न्यूनतम निकासी राशि के कारण, यह लेनदेन अगली निकासी के लिए अपर्याप्त धनराशि से बचने के लिए सभी परिसंपत्तियों को अनस्टेक कर देगा।", @@ -678,6 +682,8 @@ "form__approve_str": "{amount} {symbol} को मंजूरी दें", "form__priority_fee": "प्राथमिकता शुल्क", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Windows Hello सेट करें विफल", "global.404_message": "क्षमा करें, कुछ गलत हो गया!", "global.Note": "नोट", "global.about": "बारे में", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "कोट्स को ताजगी दें", "swap_page.button_select_token": "टोकन का चयन करें", "swap_page.button_wrap": "व्रैप अनुबंध के माध्यम से अदला-बदली करें", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "से", "swap_page.limit": "सीमा", "swap_page.limit_dialog_button": "पुष्टि करें", diff --git a/packages/shared/src/locale/json/id.json b/packages/shared/src/locale/json/id.json index e251d56c79e..e3141cce232 100644 --- a/packages/shared/src/locale/json/id.json +++ b/packages/shared/src/locale/json/id.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Kunci stETH/wstETH Anda dengan mengajukan permintaan penarikan. Setelah 1-4 hari, stETH yang terkunci akan dihancurkan dan ETH Anda akan tersedia untuk ditarik.", "earn.request_withdrawal_stmatic_desc": "1-4 hari setelah mengajukan permintaan penarikan, stMATIC yang terkunci akan dihancurkan dan MATIC Anda akan tersedia untuk ditarik.", "earn.reward_tokens": "Token hadiah", + "earn.reward_value": "Nilai hadiah", "earn.rewards": "Hadiah", "earn.rewards_automatically_restaked": "Hadiah {automatically} ditambahkan kembali, meningkatkan jumlah yang Anda staking", "earn.rewards_manually_restaked": "Hadiah perlu {manually} ditarik dan dipertaruhkan kembali", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} sedang ditunda", "earn.token_is_staked": "{token} telah di-stake", "earn.total_staked_value": "Nilai total yang di-stake", + "earn.transaction_loss": "Kerugian transaksi", + "earn.transaction_loss_when_claim": "Karena biaya jaringan yang diperkirakan melebihi hadiah Anda, transaksi ini akan mengakibatkan kerugian sebesar {number}.", + "earn.transaction_loss_when_stake": "Berdasarkan perkiraan tarif saat ini, akan memakan waktu sekitar {number} hari bagi penghasilan Anda untuk menutupi kerugian.", "earn.tvl": "TVL", "earn.unlock_time": "Waktu membuka kunci", "earn.unstake_all_due_to_min_withdrawal": "Karena jumlah penarikan minimum {number} {symbol} , transaksi ini akan membatalkan semua aset untuk menghindari kekurangan dana untuk penarikan berikutnya.", @@ -678,6 +682,8 @@ "form__approve_str": "Menyetujui {amount} {symbol}", "form__priority_fee": "Biaya Prioritas", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Gagal mengatur Windows Hello", "global.404_message": "Maaf, ada yang salah!", "global.Note": "Catatan", "global.about": "Tentang", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Segarkan kutipan", "swap_page.button_select_token": "Pilih token", "swap_page.button_wrap": "Tukar melalui Kontrak Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "Dari", "swap_page.limit": "Batas", "swap_page.limit_dialog_button": "Konfirmasi", diff --git a/packages/shared/src/locale/json/it_IT.json b/packages/shared/src/locale/json/it_IT.json index 94a938033b9..fe3d13ce816 100644 --- a/packages/shared/src/locale/json/it_IT.json +++ b/packages/shared/src/locale/json/it_IT.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Blocca il tuo stETH/wstETH emettendo una richiesta di prelievo. Dopo 1-4 giorni, lo stETH bloccato verrà distrutto e il tuo ETH diventerà disponibile per il prelievo.", "earn.request_withdrawal_stmatic_desc": "1-4 giorni dopo aver emesso una richiesta di prelievo, lo stMATIC bloccato sarà distrutto e il tuo MATIC diventerà disponibile per il prelievo.", "earn.reward_tokens": "Token di ricompensa", + "earn.reward_value": "Valore della ricompensa", "earn.rewards": "Ricompense", "earn.rewards_automatically_restaked": "Le ricompense vengono {automatically} reinvestite, aumentando il tuo corpo puntato", "earn.rewards_manually_restaked": "Le ricompense devono essere ritirate {manually} e reinvestite", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} è in attesa", "earn.token_is_staked": "{token} è in staking", "earn.total_staked_value": "Valore totale puntato", + "earn.transaction_loss": "Perdita di transazione", + "earn.transaction_loss_when_claim": "A causa della commissione di rete stimata che supera le tue ricompense, questa transazione comporterà una perdita di {number}.", + "earn.transaction_loss_when_stake": "In base al tasso stimato attuale, ci vorranno circa {number} giorni affinché i tuoi guadagni coprano le perdite.", "earn.tvl": "TVL", "earn.unlock_time": "Ora di sblocco", "earn.unstake_all_due_to_min_withdrawal": "A causa dell'importo minimo di prelievo di {number} {symbol} , questa transazione annullerà la scommessa su tutti gli asset per evitare che i fondi siano insufficienti per il prelievo successivo.", @@ -678,6 +682,8 @@ "form__approve_str": "Approva {amount} {symbol}", "form__priority_fee": "Tariffa Prioritaria", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Imposta il fallimento di Windows Hello", "global.404_message": "Spiacente, qualcosa è andato storto!", "global.Note": "Nota", "global.about": "Informazioni", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Aggiorna quotazioni", "swap_page.button_select_token": "Seleziona token", "swap_page.button_wrap": "Scambio tramite Contratto Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "Da", "swap_page.limit": "Limite", "swap_page.limit_dialog_button": "Conferma", diff --git a/packages/shared/src/locale/json/ja_JP.json b/packages/shared/src/locale/json/ja_JP.json index d3fcec4b893..71b0d595390 100644 --- a/packages/shared/src/locale/json/ja_JP.json +++ b/packages/shared/src/locale/json/ja_JP.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "引き出しリクエストを発行して、stETH/wstETHをロックします。1〜4日後、ロックされたstETHは破壊され、ETHが引き出し可能になります。", "earn.request_withdrawal_stmatic_desc": "引き出しリクエストを発行してから1〜4日後、ロックされたstMATICは破壊され、あなたのMATICは引き出し可能になります。", "earn.reward_tokens": "報酬トークン", + "earn.reward_value": "報酬の価値", "earn.rewards": "報酬", "earn.rewards_automatically_restaked": "報酬は{automatically}再ステーキングされ、あなたのステーキング体を増やします", "earn.rewards_manually_restaked": "報酬は{manually}引き出され、再投資される必要があります", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} は保留中です", "earn.token_is_staked": "{token}がステイクされています", "earn.total_staked_value": "総ステーク額", + "earn.transaction_loss": "取引損失", + "earn.transaction_loss_when_claim": "推定ネットワーク手数料が報酬を上回るため、この取引は{number}の損失となります。", + "earn.transaction_loss_when_stake": "現在の推定レートに基づくと、損失を補うためには約{number}日かかるでしょう。", "earn.tvl": "TVL", "earn.unlock_time": "ロック解除時間", "earn.unstake_all_due_to_min_withdrawal": "最小引き出し額が{number} {symbol}であるため、このトランザクションでは、次の引き出しに資金が不足するのを避けるために、すべての資産のステーキングが解除されます。", @@ -678,6 +682,8 @@ "form__approve_str": "{amount} {symbol}を承認する", "form__priority_fee": "優先料金", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Windows Hello の設定に失敗しました", "global.404_message": "申し訳ありません、何か問題が発生しました！", "global.Note": "注意", "global.about": "約", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "引用を更新する", "swap_page.button_select_token": "トークンを選択", "swap_page.button_wrap": "ラップ契約を介した交換", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "から", "swap_page.limit": "制限", "swap_page.limit_dialog_button": "確認", diff --git a/packages/shared/src/locale/json/ko_KR.json b/packages/shared/src/locale/json/ko_KR.json index 3fdf921e956..4ab66bfa296 100644 --- a/packages/shared/src/locale/json/ko_KR.json +++ b/packages/shared/src/locale/json/ko_KR.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "출금 요청을 통해 stETH/wstETH를 잠그세요. 1-4일 후, 잠긴 stETH는 파괴되고 귀하의 ETH는 출금 가능 상태가 됩니다.", "earn.request_withdrawal_stmatic_desc": "출금 요청을 한 후 1-4일 이내에 잠긴 stMATIC은 파괴되고, 여러분의 MATIC은 출금 가능 상태가 됩니다.", "earn.reward_tokens": "보상 토큰", + "earn.reward_value": "보상 가치", "earn.rewards": "보상", "earn.rewards_automatically_restaked": "보상은 {automatically} 재스테이킹되어, 스테이킹된 본문을 증가시킵니다", "earn.rewards_manually_restaked": "보상은 {manually} 인출하고 재스테이킹해야 합니다", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token}이 보류 중입니다", "earn.token_is_staked": "{token}이 스테이킹되었습니다", "earn.total_staked_value": "총 스테이킹 가치", + "earn.transaction_loss": "거래 손실", + "earn.transaction_loss_when_claim": "추정 네트워크 수수료가 보상을 초과하여 이 거래는 {number}의 손실을 초래할 것입니다.", + "earn.transaction_loss_when_stake": "현재 추정된 속도에 따르면, 손실을 만회하는 데 약 {number}일이 걸릴 것입니다.", "earn.tvl": "TVL", "earn.unlock_time": "잠금 해제 시간", "earn.unstake_all_due_to_min_withdrawal": "최소 출금 금액이 {number} {symbol} 이므로, 이 거래에서는 다음 출금에 필요한 자금이 부족해지는 것을 방지하기 위해 모든 자산의 지분을 해제합니다.", @@ -678,6 +682,8 @@ "form__approve_str": "{amount} {symbol} 승인", "form__priority_fee": "우선 순위 요금", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Windows Hello 설정 실패", "global.404_message": "죄송합니다, 문제가 발생했습니다!", "global.Note": "노트", "global.about": "소개", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "견적 갱신", "swap_page.button_select_token": "토큰 선택", "swap_page.button_wrap": "랩 계약을 통한 교환", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "에서", "swap_page.limit": "제한", "swap_page.limit_dialog_button": "확인", diff --git a/packages/shared/src/locale/json/pt.json b/packages/shared/src/locale/json/pt.json index deea0d9b52f..b9fe6249f16 100644 --- a/packages/shared/src/locale/json/pt.json +++ b/packages/shared/src/locale/json/pt.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Bloqueie seu stETH/wstETH emitindo um pedido de retirada. Após 1-4 dias, o stETH bloqueado será destruído e seu ETH estará disponível para retirada.", "earn.request_withdrawal_stmatic_desc": "1-4 dias após solicitar um saque, o stMATIC bloqueado será destruído e seu MATIC estará disponível para saque.", "earn.reward_tokens": "Tokens de recompensa", + "earn.reward_value": "Valor da recompensa", "earn.rewards": "Recompensas", "earn.rewards_automatically_restaked": "As recompensas são {automatically} reinvestidas, aumentando o seu corpo apostado", "earn.rewards_manually_restaked": "As recompensas precisam ser {manually} retiradas e reinvestidas", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} está pendente", "earn.token_is_staked": "{token} está apostado", "earn.total_staked_value": "Valor total em staking", + "earn.transaction_loss": "Perda de transação", + "earn.transaction_loss_when_claim": "Devido à taxa de rede estimada exceder suas recompensas, esta transação resultará em uma perda de {number}.", + "earn.transaction_loss_when_stake": "Com base na taxa estimada atual, levará cerca de {number} dias para que seus ganhos cubram as perdas.", "earn.tvl": "TVL", "earn.unlock_time": "Tempo de desbloqueio", "earn.unstake_all_due_to_min_withdrawal": "Devido ao valor mínimo de retirada de {number} {symbol} , esta transação retirará todos os ativos para evitar fundos insuficientes para a próxima retirada.", @@ -678,6 +682,8 @@ "form__approve_str": "Aprovar {amount} {symbol}", "form__priority_fee": "Taxa de Prioridade", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Configurar falha do Windows Hello", "global.404_message": "Desculpe, algo deu errado!", "global.Note": "Nota", "global.about": "Sobre", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Atualizar cotações", "swap_page.button_select_token": "Selecione o token", "swap_page.button_wrap": "Troca via Contrato Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "De", "swap_page.limit": "Limite", "swap_page.limit_dialog_button": "Confirmar", diff --git a/packages/shared/src/locale/json/pt_BR.json b/packages/shared/src/locale/json/pt_BR.json index 5cf9d887c72..d82532ec085 100644 --- a/packages/shared/src/locale/json/pt_BR.json +++ b/packages/shared/src/locale/json/pt_BR.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Bloqueie seu stETH/wstETH emitindo uma solicitação de saque. Após 1-4 dias, o stETH bloqueado será destruído e seu ETH estará disponível para saque.", "earn.request_withdrawal_stmatic_desc": "1-4 dias após solicitar um saque, o stMATIC bloqueado será destruído e seu MATIC estará disponível para saque.", "earn.reward_tokens": "Tokens de recompensa", + "earn.reward_value": "Valor da recompensa", "earn.rewards": "Recompensas", "earn.rewards_automatically_restaked": "As recompensas são {automatically} reinvestidas, aumentando seu corpo apostado", "earn.rewards_manually_restaked": "As recompensas precisam ser {manually} retiradas e reinvestidas", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} está pendente", "earn.token_is_staked": "{token} está apostado", "earn.total_staked_value": "Valor total em staking", + "earn.transaction_loss": "Perda de transação", + "earn.transaction_loss_when_claim": "Devido à taxa de rede estimada exceder suas recompensas, esta transação resultará em uma perda de {number}.", + "earn.transaction_loss_when_stake": "Com base na taxa estimada atual, levará cerca de {number} dias para que seus ganhos cubram as perdas.", "earn.tvl": "TVL", "earn.unlock_time": "Tempo de desbloqueio", "earn.unstake_all_due_to_min_withdrawal": "Devido ao valor mínimo de retirada de {number} {symbol} , esta transação retirará todos os ativos para evitar fundos insuficientes para a próxima retirada.", @@ -678,6 +682,8 @@ "form__approve_str": "Aprovar {amount} {symbol}", "form__priority_fee": "Taxa Prioritária", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Falha ao configurar o Windows Hello", "global.404_message": "Desculpe, algo deu errado!", "global.Note": "Nota", "global.about": "Sobre", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Atualizar cotações", "swap_page.button_select_token": "Selecione o token", "swap_page.button_wrap": "Troca via Contrato Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "De", "swap_page.limit": "Limite", "swap_page.limit_dialog_button": "Confirmar", diff --git a/packages/shared/src/locale/json/ru.json b/packages/shared/src/locale/json/ru.json index 2005da30c45..e9d0c90adc4 100644 --- a/packages/shared/src/locale/json/ru.json +++ b/packages/shared/src/locale/json/ru.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Заблокируйте свои stETH/wstETH, отправив запрос на вывод. Через 1-4 дней заблокированные stETH будут уничтожены, и ваши ETH станут доступны для вывода.", "earn.request_withdrawal_stmatic_desc": "Через 1-4 дней после подачи заявки на вывод, заблокированный stMATIC будет уничтожен, и ваши MATIC станут доступны для вывода.", "earn.reward_tokens": "Токены вознаграждения", + "earn.reward_value": "Стоимость вознаграждения", "earn.rewards": "Награды", "earn.rewards_automatically_restaked": "Награды {automatically} переинвестируются, увеличивая вашу ставку", "earn.rewards_manually_restaked": "Награды необходимо {manually} снять и заново инвестировать", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} находится в ожидании", "earn.token_is_staked": "{token} находится в стейкинге", "earn.total_staked_value": "Общая стоимость стейка", + "earn.transaction_loss": "Потеря транзакции", + "earn.transaction_loss_when_claim": "Из-за того, что комиссия за сеть превышает ваши вознаграждения, эта транзакция приведет к убытку в размере {number}.", + "earn.transaction_loss_when_stake": "Исходя из текущей оценочной ставки, потребуется около {number} дней, чтобы ваши доходы покрыли убытки.", "earn.tvl": "TVL", "earn.unlock_time": "Время разблокировки", "earn.unstake_all_due_to_min_withdrawal": "В связи с тем, что минимальная сумма вывода составляет {number} {symbol} , эта транзакция отменит стейкинг всех активов, чтобы избежать недостатка средств для следующего вывода.", @@ -678,6 +682,8 @@ "form__approve_str": "Одобрить {amount} {symbol}", "form__priority_fee": "Приоритетная плата", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Ошибка настройки Windows Hello", "global.404_message": "Извините, что-то пошло не так!", "global.Note": "Примечание", "global.about": "О нас", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Обновить котировки", "swap_page.button_select_token": "Выберите токен", "swap_page.button_wrap": "Обмен через Wrap Contract", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "От", "swap_page.limit": "Лимит", "swap_page.limit_dialog_button": "Подтвердить", diff --git a/packages/shared/src/locale/json/th_TH.json b/packages/shared/src/locale/json/th_TH.json index ec8b21b59dd..5dea504f84f 100644 --- a/packages/shared/src/locale/json/th_TH.json +++ b/packages/shared/src/locale/json/th_TH.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "ล็อค stETH/wstETH ของคุณโดยการส่งคำขอถอน. หลังจาก 1-4 วัน, stETH ที่ถูกล็อคจะถูกทำลายและ ETH ของคุณจะสามารถถอนได้.", "earn.request_withdrawal_stmatic_desc": "1-4 วันหลังจากการส่งคำขอถอนเงิน stMATIC ที่ถูกล็อคจะถูกทำลายและ MATIC ของคุณจะสามารถถอนได้", "earn.reward_tokens": "โทเค็นรางวัล", + "earn.reward_value": "มูลค่ารางวัล", "earn.rewards": "รางวัล", "earn.rewards_automatically_restaked": "รางวัลจะถูก {automatically} นำไปเพิ่มในส่วนที่คุณได้เสนอเป็นส่วนแบ่ง", "earn.rewards_manually_restaked": "ต้องถอนและเข้าสู่ระบบรางวัล{manually}", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} กำลังรอดำเนินการ", "earn.token_is_staked": "{token} ถูกเสนอ", "earn.total_staked_value": "มูลค่ารวมที่ถูกวางเดิมพัน", + "earn.transaction_loss": "การสูญเสียการทำธุรกรรม", + "earn.transaction_loss_when_claim": "เนื่องจากค่าธรรมเนียมเครือข่ายที่สูงกว่ารางวัลของคุณ การทำธุรกรรมนี้จะส่งผลให้ขาดทุน {number}.", + "earn.transaction_loss_when_stake": "จากอัตราประมาณการในปัจจุบัน จะใช้เวลาประมาณ {number} วันเพื่อให้รายได้ของคุณครอบคลุมการขาดทุน", "earn.tvl": "TVL", "earn.unlock_time": "เวลาปลดล็อค", "earn.unstake_all_due_to_min_withdrawal": "เนื่องจากจำนวนเงินถอนขั้นต่ำอยู่ที่ {number} {symbol} การทำธุรกรรมนี้จะยกเลิกการเดิมพันสินทรัพย์ทั้งหมดเพื่อหลีกเลี่ยงเงินไม่เพียงพอสำหรับการถอนครั้งต่อไป", @@ -678,6 +682,8 @@ "form__approve_str": "อนุมัติ {amount} {symbol}", "form__priority_fee": "ค่าธรรมเนียมลำดับความสำคัญ", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "ตั้งค่า Windows Hello ล้มเหลว", "global.404_message": "ขออภัย, มีบางอย่างผิดพลาด!", "global.Note": "หมายเหตุ", "global.about": "เกี่ยวกับ", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "รีเฟรชคำพูด", "swap_page.button_select_token": "เลือกโทเค็น", "swap_page.button_wrap": "แลกเปลี่ยนผ่านสัญญา Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "จาก", "swap_page.limit": "จำกัด", "swap_page.limit_dialog_button": "ยืนยัน", diff --git a/packages/shared/src/locale/json/uk_UA.json b/packages/shared/src/locale/json/uk_UA.json index 4c49b4d8244..b3d0c8dd0ee 100644 --- a/packages/shared/src/locale/json/uk_UA.json +++ b/packages/shared/src/locale/json/uk_UA.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Заблокуйте свої stETH/wstETH, висунувши запит на виведення. Після 1-4 днів заблоковані stETH будуть знищені, а ваш ETH стане доступним для виведення.", "earn.request_withdrawal_stmatic_desc": "1-4 днів після подання запиту на виведення коштів, заблокований stMATIC буде знищений, а ваш MATIC стане доступним для виведення.", "earn.reward_tokens": "Нагородні токени", + "earn.reward_value": "Значення винагороди", "earn.rewards": "Нагороди", "earn.rewards_automatically_restaked": "Винагороди {automatically} повторно ставляться в ставку, збільшуючи вашу ставлену суму", "earn.rewards_manually_restaked": "Нагороди потрібно {manually} зняти та знову ставити", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} очікує", "earn.token_is_staked": "{token} здійснено ставку", "earn.total_staked_value": "Загальна сума стейка", + "earn.transaction_loss": "Втрата транзакції", + "earn.transaction_loss_when_claim": "Через те, що мережевий збір перевищує ваші винагороди, ця транзакція призведе до втрати {number}.", + "earn.transaction_loss_when_stake": "Виходячи з поточного оціночного курсу, знадобиться приблизно {number} днів, щоб ваші доходи покрили збитки.", "earn.tvl": "TVL", "earn.unlock_time": "Час розблокування", "earn.unstake_all_due_to_min_withdrawal": "Оскільки мінімальна сума для зняття становить {number} {symbol} , ця транзакція зніме всі активи, щоб уникнути недостатності коштів для наступного зняття.", @@ -678,6 +682,8 @@ "form__approve_str": "Підтвердити {amount} {symbol}", "form__priority_fee": "Приоритетний збір", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Не вдалося налаштувати Windows Hello", "global.404_message": "Вибачте, щось пішло не так!", "global.Note": "Примітка", "global.about": "Про", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Оновити цитати", "swap_page.button_select_token": "Виберіть токен", "swap_page.button_wrap": "Обмін через контракт Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "Від", "swap_page.limit": "Ліміт", "swap_page.limit_dialog_button": "Підтвердити", diff --git a/packages/shared/src/locale/json/vi.json b/packages/shared/src/locale/json/vi.json index 38c22d15fdb..80dc1bc951f 100644 --- a/packages/shared/src/locale/json/vi.json +++ b/packages/shared/src/locale/json/vi.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "Khóa stETH/wstETH của bạn bằng cách yêu cầu rút tiền. Sau 1-4 ngày, stETH đã khóa sẽ bị hủy và ETH của bạn sẽ có thể rút được.", "earn.request_withdrawal_stmatic_desc": "1-4 ngày sau khi yêu cầu rút tiền, stMATIC bị khóa sẽ bị hủy và MATIC của bạn sẽ trở nên có thể rút được.", "earn.reward_tokens": "Điểm thưởng", + "earn.reward_value": "Giá trị phần thưởng", "earn.rewards": "Phần thưởng", "earn.rewards_automatically_restaked": "Phần thưởng sẽ {automatically} được cược lại, làm tăng số lượng bạn đã cược", "earn.rewards_manually_restaked": "Phần thưởng cần được {manually} và đặt cược lại", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} đang chờ xử lý", "earn.token_is_staked": "{token} đã được cược", "earn.total_staked_value": "Tổng giá trị đã stake", + "earn.transaction_loss": "Mất mát giao dịch", + "earn.transaction_loss_when_claim": "Do phí mạng ước tính vượt quá phần thưởng của bạn, giao dịch này sẽ dẫn đến mất {number}.", + "earn.transaction_loss_when_stake": "Dựa trên tỷ lệ ước tính hiện tại, sẽ mất khoảng {number} ngày để thu nhập của bạn bù đắp cho các khoản lỗ.", "earn.tvl": "TVL", "earn.unlock_time": "Thời gian mở khóa", "earn.unstake_all_due_to_min_withdrawal": "Do số tiền rút tối thiểu là {number} {symbol} , giao dịch này sẽ hủy đặt cọc tất cả tài sản để tránh tình trạng không đủ tiền cho lần rút tiền tiếp theo.", @@ -678,6 +682,8 @@ "form__approve_str": "Phê duyệt {amount} {symbol}", "form__priority_fee": "Phí Ưu Tiên", "form__sats__units": "sats", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "Thiết lập Windows Hello thất bại", "global.404_message": "Xin lỗi, đã có lỗi xảy ra!", "global.Note": "Ghi chú", "global.about": "Về", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "Làm mới báo giá", "swap_page.button_select_token": "Chọn token", "swap_page.button_wrap": "Hoán đổi qua Hợp đồng Wrap", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "Từ", "swap_page.limit": "Giới hạn", "swap_page.limit_dialog_button": "Xác nhận", diff --git a/packages/shared/src/locale/json/zh_CN.json b/packages/shared/src/locale/json/zh_CN.json index fa867fe9b1e..738761fffde 100644 --- a/packages/shared/src/locale/json/zh_CN.json +++ b/packages/shared/src/locale/json/zh_CN.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "发出提款请求来锁定您的 stETH/wstETH。在 1-4 天后，锁定的 stETH 将被销毁，您的 ETH 将可供提款。", "earn.request_withdrawal_stmatic_desc": "在发出取款请求后的 1-4 天内，锁定的 stMATIC 将被销毁，您的 MATIC 将可供取款。", "earn.reward_tokens": "收益代币", + "earn.reward_value": "收益价值", "earn.rewards": "收益", "earn.rewards_automatically_restaked": "收益会 {automatically} 重新投入，增加你的质押本金", "earn.rewards_manually_restaked": "收益需要 {manually} 提取并重新质押", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} 正在处理中", "earn.token_is_staked": "{token} 已被质押", "earn.total_staked_value": "总质押价值", + "earn.transaction_loss": "交易损耗", + "earn.transaction_loss_when_claim": "由于估计的网络费用超过了您的收益，此交易将导致 {number} 的损失。", + "earn.transaction_loss_when_stake": "根据目前的收益率，大约需要 {number} 天才能弥补您的网络费用损失。", "earn.tvl": "TVL", "earn.unlock_time": "解锁时间", "earn.unstake_all_due_to_min_withdrawal": "由于最小赎回金额为 {number} {symbol} ，本交易将解质押所有资产，以避免下次取款资金不足。", @@ -678,6 +682,8 @@ "form__approve_str": "授权 {amount} {symbol}", "form__priority_fee": "矿工小费", "form__sats__units": "聪", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "设置 Windows Hello 失败", "global.404_message": "对不起，出了点问题！", "global.Note": "备注", "global.about": "关于", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "刷新报价", "swap_page.button_select_token": "选择代币", "swap_page.button_wrap": "通过 Wrap 合约兑换", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "发送", "swap_page.limit": "限价", "swap_page.limit_dialog_button": "确认", diff --git a/packages/shared/src/locale/json/zh_HK.json b/packages/shared/src/locale/json/zh_HK.json index 5b30ba6f111..37cf89ff1b3 100644 --- a/packages/shared/src/locale/json/zh_HK.json +++ b/packages/shared/src/locale/json/zh_HK.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "發出提款請求來鎖定您的 stETH/wstETH。在 1-4 天後，鎖定的 stETH 將被銷毀，您的 ETH 將可供提款。", "earn.request_withdrawal_stmatic_desc": "在發出取款請求後的 1-4 天內，鎖定的 stMATIC 將被銷毀，您的 MATIC 將可供取款。", "earn.reward_tokens": "收益代幣", + "earn.reward_value": "收益價值", "earn.rewards": "收益", "earn.rewards_automatically_restaked": "收益會 {automatically} 重新投注，增加您的質押本金", "earn.rewards_manually_restaked": "收益需要 {manually} 提取並重新質押", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} 正在處理中", "earn.token_is_staked": "{token} 已被質押", "earn.total_staked_value": "總質押價值", + "earn.transaction_loss": "交易損耗", + "earn.transaction_loss_when_claim": "由於預估的網絡費用超過了您的收益，此交易將導致 {number} 的損失。", + "earn.transaction_loss_when_stake": "根據目前的收益率，大約需要 {number} 天才能彌補您的網絡費用損失。", "earn.tvl": "TVL", "earn.unlock_time": "解鎖時間", "earn.unstake_all_due_to_min_withdrawal": "由於最小贖回金額為 {number} {symbol} ，本交易將解質押所有資產，以避免下次取款資金不足。", @@ -678,6 +682,8 @@ "form__approve_str": "授權 {amount} {symbol}", "form__priority_fee": "礦工小費", "form__sats__units": "聪", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "設定 Windows Hello 失敗", "global.404_message": "對不起，出了點問題！", "global.Note": "備註", "global.about": "關於", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "刷新報價", "swap_page.button_select_token": "選擇代幣", "swap_page.button_wrap": "透過 Wrap 合約進行兌換", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "發送", "swap_page.limit": "限價", "swap_page.limit_dialog_button": "確認", diff --git a/packages/shared/src/locale/json/zh_TW.json b/packages/shared/src/locale/json/zh_TW.json index b3e08389368..b829f189de8 100644 --- a/packages/shared/src/locale/json/zh_TW.json +++ b/packages/shared/src/locale/json/zh_TW.json @@ -398,6 +398,7 @@ "earn.request_withdrawal_steth_desc": "發出提款請求以鎖定您的 stETH/wstETH。在 1-4 天後，鎖定的 stETH 將被銷毀，您的 ETH 將可供提款。", "earn.request_withdrawal_stmatic_desc": "在提出提款請求後的 1-4 天內，鎖定的 stMATIC 將被銷毀，您的 MATIC 將可供提款。", "earn.reward_tokens": "收益代幣", + "earn.reward_value": "收益價值", "earn.rewards": "收益", "earn.rewards_automatically_restaked": "收益會 {automatically} 重新投入，增加您的質押本金", "earn.rewards_manually_restaked": "收益需要 {manually} 提取並重新質押", @@ -428,6 +429,9 @@ "earn.token_is_pending": "{token} 正在處理中", "earn.token_is_staked": "{token} 已被質押", "earn.total_staked_value": "總質押價值", + "earn.transaction_loss": "交易損耗", + "earn.transaction_loss_when_claim": "由於預估的網路費用超過了您的收益，此交易將導致 {number} 的損失。", + "earn.transaction_loss_when_stake": "根據目前的收益率，大約需要 {number} 天才能彌補您的網路費用損失。", "earn.tvl": "TVL", "earn.unlock_time": "解鎖時間", "earn.unstake_all_due_to_min_withdrawal": "由於最小贖回金額為 {number} {symbol} ，本交易將解質押所有資產，以避免下次取款資金不足。", @@ -678,6 +682,8 @@ "form__approve_str": "授權 {amount} {symbol}", "form__priority_fee": "礦工小費", "form__sats__units": "聰", + "global.windows_hello": "Windows Hello", + "global.windows_hello_set_error": "設定 Windows Hello 失敗", "global.404_message": "對不起，出了些問題！", "global.Note": "備註", "global.about": "關於", @@ -1691,6 +1697,7 @@ "swap_page.button_refresh_quotes": "刷新報價", "swap_page.button_select_token": "選擇代幣", "swap_page.button_wrap": "透過 Wrap 合約進行兌換", + "swap_page.buy_sell_tax": "buy/sell tax", "swap_page.from": "發送", "swap_page.limit": "限價", "swap_page.limit_dialog_button": "確認", From 45241ce8e085515d74fdb2771b39c5df1426bbe6 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 15:18:03 +0800 Subject: [PATCH 19/22] Update PasswordVerify.tsx --- .../Password/components/PasswordVerify.tsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/kit/src/components/Password/components/PasswordVerify.tsx b/packages/kit/src/components/Password/components/PasswordVerify.tsx index 6d51fed65d6..7db06975941 100644 --- a/packages/kit/src/components/Password/components/PasswordVerify.tsx +++ b/packages/kit/src/components/Password/components/PasswordVerify.tsx @@ -15,6 +15,7 @@ import type { IKeyOfIcons, IPropsWithTestId } from '@onekeyhq/components'; import { Form, Input, useForm } from '@onekeyhq/components'; import { usePasswordAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms'; import { ETranslations } from '@onekeyhq/shared/src/locale'; +import platformEnv from '@onekeyhq/shared/src/platformEnv'; import { EPasswordVerifyStatus } from '@onekeyhq/shared/types/password'; import { useHandleAppStateActive } from '../../../hooks/useHandleAppStateActive'; @@ -80,13 +81,17 @@ const PasswordVerify = ({ loading?: boolean; }>[] = []; if (isEnable && !passwordInput) { + let iconName: IKeyOfIcons = + authType && + (authType.includes(AuthenticationType.FACIAL_RECOGNITION) || + authType.includes(AuthenticationType.IRIS)) + ? 'FaceIdOutline' + : 'TouchId2Outline'; + if (platformEnv.isDesktopWin) { + iconName = 'WindowsHelloSolid'; + } actions.push({ - iconName: - authType && - (authType.includes(AuthenticationType.FACIAL_RECOGNITION) || - authType.includes(AuthenticationType.IRIS)) - ? 'FaceIdOutline' - : 'TouchId2Outline', + iconName, onPress: onBiologyAuth, loading: status.value === EPasswordVerifyStatus.VERIFYING, }); From 45a96298d85f861636dfef65c480e3e6672efcfa Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 15:56:28 +0800 Subject: [PATCH 20/22] Update BiologyAuthSwitchContainer.tsx --- .../container/BiologyAuthSwitchContainer.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/kit/src/components/BiologyAuthComponent/container/BiologyAuthSwitchContainer.tsx b/packages/kit/src/components/BiologyAuthComponent/container/BiologyAuthSwitchContainer.tsx index 17e0878c25f..ed97ea508fd 100644 --- a/packages/kit/src/components/BiologyAuthComponent/container/BiologyAuthSwitchContainer.tsx +++ b/packages/kit/src/components/BiologyAuthComponent/container/BiologyAuthSwitchContainer.tsx @@ -7,6 +7,7 @@ import backgroundApiProxy from '@onekeyhq/kit/src/background/instance/background import { useSettingsPersistAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms'; import { usePasswordBiologyAuthInfoAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms/password'; import { ETranslations } from '@onekeyhq/shared/src/locale'; +import platformEnv from '@onekeyhq/shared/src/platformEnv'; import BiologyAuthSwitch from '../components/BiologyAuthSwitch'; @@ -30,7 +31,9 @@ const BiologyAuthSwitchContainer = ({ } catch (e) { Toast.error({ title: intl.formatMessage({ - id: ETranslations.global_touch_id_set_error, + id: platformEnv.isDesktopWin + ? ETranslations.global_windows_hello_set_error + : ETranslations.global_touch_id_set_error, }), }); } From 59e28f9bb03d52250468dd088df6ae682e6ab85c Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 17:35:15 +0800 Subject: [PATCH 21/22] add electron-windows-security --- apps/desktop/package.json | 4 ++-- apps/desktop/src-electron/app.ts | 2 +- yarn.lock | 36 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index c542ddf3195..cbeb48ede06 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -39,9 +39,9 @@ "electron-log": "5.2.0", "electron-store": "^8.2.0", "electron-updater": "6.1.8", + "electron-windows-security": "0.0.1", "keytar": "^7.9.0", - "node-fetch": "^2.6.7", - "windows.security.credentials.ui": "git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a" + "node-fetch": "^2.6.7" }, "devDependencies": { "@electron/notarize": "^2.3.0", diff --git a/apps/desktop/src-electron/app.ts b/apps/desktop/src-electron/app.ts index 6e0e01926c7..8c7bf8d2f75 100644 --- a/apps/desktop/src-electron/app.ts +++ b/apps/desktop/src-electron/app.ts @@ -21,7 +21,7 @@ import logger from 'electron-log/main'; import windowsSecurityCredentialsUiModule, { UserConsentVerificationResult, UserConsentVerifierAvailability, -} from 'windows.security.credentials.ui'; +} from 'electron-windows-security'; import { ONEKEY_APP_DEEP_LINK_NAME, diff --git a/yarn.lock b/yarn.lock index 61d5d34b270..30c888e372d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6688,6 +6688,7 @@ __metadata: electron-log: "npm:5.2.0" electron-store: "npm:^8.2.0" electron-updater: "npm:6.1.8" + electron-windows-security: "npm:0.0.1" esbuild: "npm:0.15.18" folderslint: "npm:^1.2.0" glob: "npm:^7.2.0" @@ -6695,7 +6696,6 @@ __metadata: node-fetch: "npm:^2.6.7" rimraf: "npm:^3" webpack: "npm:5.90.3" - windows.security.credentials.ui: "git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a" languageName: unknown linkType: soft @@ -19692,6 +19692,15 @@ __metadata: languageName: node linkType: hard +"electron-windows-security@npm:0.0.1": + version: 0.0.1 + resolution: "electron-windows-security@npm:0.0.1" + dependencies: + nan: "npm:2.20.0" + checksum: 10/eba085b13c3bd8da33d0bab4cc5884582a1a68eb756a87af38415ed13782e88b0ab0097ea9e274324f792d5ab0b753b73d95aeac1ca3ee6f41dc22fb353d22e0 + languageName: node + linkType: hard + "electron@npm:27.3.1": version: 27.3.1 resolution: "electron@npm:27.3.1" @@ -28667,21 +28676,21 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.13.2, nan@npm:^2.14.0, nan@npm:^2.2.1": - version: 2.18.0 - resolution: "nan@npm:2.18.0" +"nan@npm:2.20.0": + version: 2.20.0 + resolution: "nan@npm:2.20.0" dependencies: node-gyp: "npm:latest" - checksum: 10/5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0 + checksum: 10/5f16e4c9953075d9920229c703c1d781c0b74118ce3d9e926b448a4eef92b7d8be5ac6adc748a13a5fafb594436cbfe63250e3471aefdd78e3a0cd14603b9ba7 languageName: node linkType: hard -"nan@npm:latest": - version: 2.20.0 - resolution: "nan@npm:2.20.0" +"nan@npm:^2.13.2, nan@npm:^2.14.0, nan@npm:^2.2.1": + version: 2.18.0 + resolution: "nan@npm:2.18.0" dependencies: node-gyp: "npm:latest" - checksum: 10/5f16e4c9953075d9920229c703c1d781c0b74118ce3d9e926b448a4eef92b7d8be5ac6adc748a13a5fafb594436cbfe63250e3471aefdd78e3a0cd14603b9ba7 + checksum: 10/5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0 languageName: node linkType: hard @@ -38231,15 +38240,6 @@ __metadata: languageName: node linkType: hard -"windows.security.credentials.ui@git+https://github.com/huhuanming/windows.security.credentials.ui#373763ab6577977687d72bde7af8aabf3220f98a": - version: 0.1.7 - resolution: "windows.security.credentials.ui@https://github.com/huhuanming/windows.security.credentials.ui.git#commit=373763ab6577977687d72bde7af8aabf3220f98a" - dependencies: - nan: "npm:latest" - checksum: 10/9d5efafce3e403cd36915a9bc89bbccc13b8b63dcd41d8262aa91bb3f597a987148b95f4f87cfdcee683b4f3e9c20112b95fb11c5337ca1650de4a2b01f1bd97 - languageName: node - linkType: hard - "wonka@npm:^4.0.14": version: 4.0.15 resolution: "wonka@npm:4.0.15" From d94efa6c107d76edfe8e180b31a6e3e6987b03d8 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Thu, 26 Sep 2024 17:44:06 +0800 Subject: [PATCH 22/22] fix: fix type --- apps/desktop/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index cbeb48ede06..ef751f485a4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -39,7 +39,7 @@ "electron-log": "5.2.0", "electron-store": "^8.2.0", "electron-updater": "6.1.8", - "electron-windows-security": "0.0.1", + "electron-windows-security": "0.0.2", "keytar": "^7.9.0", "node-fetch": "^2.6.7" }, diff --git a/yarn.lock b/yarn.lock index 30c888e372d..70618bda1df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6688,7 +6688,7 @@ __metadata: electron-log: "npm:5.2.0" electron-store: "npm:^8.2.0" electron-updater: "npm:6.1.8" - electron-windows-security: "npm:0.0.1" + electron-windows-security: "npm:0.0.2" esbuild: "npm:0.15.18" folderslint: "npm:^1.2.0" glob: "npm:^7.2.0" @@ -19692,12 +19692,12 @@ __metadata: languageName: node linkType: hard -"electron-windows-security@npm:0.0.1": - version: 0.0.1 - resolution: "electron-windows-security@npm:0.0.1" +"electron-windows-security@npm:0.0.2": + version: 0.0.2 + resolution: "electron-windows-security@npm:0.0.2" dependencies: nan: "npm:2.20.0" - checksum: 10/eba085b13c3bd8da33d0bab4cc5884582a1a68eb756a87af38415ed13782e88b0ab0097ea9e274324f792d5ab0b753b73d95aeac1ca3ee6f41dc22fb353d22e0 + checksum: 10/bfd18d054932f3ba79b007a19c3d68e80715d01b354f15e9faff1ab54960d084f00198b344bfcc9c1cffdc06cb3d6b2eab513483f1376c22b51f0f40a47937f5 languageName: node linkType: hard