Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce the keystone usb into keplr wallet #1209

Merged
merged 19 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
"@keplr-wallet/types": "0.12.125",
"@keplr-wallet/unit": "0.12.125",
"@keystonehq/animated-qr": "^0.8.6",
"@keystonehq/hw-app-base": "0.1.1",
"@keystonehq/hw-transport-webusb": "0.4.0",
"@keystonehq/keystone-sdk": "^0.2.3",
"@ledgerhq/devices": "^6.20.0",
"@react-spring/web": "^9.6.1",
Expand Down
14 changes: 13 additions & 1 deletion apps/extension/src/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
"pages.register.name-password-hardware.connect-to-terra": "Terra app",
"pages.register.name-password-hardware.connect-to-secret": "Secret app",

"pages.register.name-password-hardware.connect-keystone-way": "Connect Keystone via",
"pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
"pages.register.name-password-hardware.connect-to-keystone-QR": "QR",

"pages.register.recover-mnemonic.title": "Import Existing Wallet",
"pages.register.recover-mnemonic.paragraph-1": "Enter your recovery phrase here to restore your wallet. Or click on any blank and paste the entire phrase.",
"pages.register.recover-mnemonic.paragraph-2": "Enter the phrase in the right order without capitalization, punctuation symbols, or spaces.",
Expand All @@ -128,7 +132,7 @@
"pages.register.connect-ledger.use-hid-confirm-title": "Unable to use Web HID",
"pages.register.connect-ledger.use-hid-confirm-paragraph": "Please enable ‘experimental web platform features’ to use Web HID",

"pages.register.connect-keystone.title": "Please Connect Your Hardware Wallet",
"pages.register.connect-keystone.paragraph": "Please unlock your Keystone device and connect it to your computer via USB.",
"pages.register.connect-keystone.step-text": "Step {num}",
"pages.register.connect-keystone.step-1": "Tap “<span>Connect Software Wallet</span>” at the bottom left corner on the Keystone device.",
"pages.register.connect-keystone.step-2": "Select “<span>Keplr Wallet</span>”.",
Expand All @@ -145,6 +149,10 @@
"pages.register.connect-keystone.tutorial": "Tutorial",
"pages.register.connect-keystone.unsupported": "Unsupported",

"pages.register.connect-keystone.usb.title": "Please Connect Your Hardware Wallet",
"pages.register.connect-keystone.usb.step-1": "Connect and unlock your Keystone.",
"pages.register.connect-keystone.usb.step-2": "Ensure your Keystone 3 Pro is on the homepage.",

"pages.register.enable-chains.title": "Select Chains",
"pages.register.enable-chains.paragraph": "Don’t worry, you can change your selections anytime in the Manage Chain Visibility in the sidebar menu.",
"pages.register.enable-chains.search-input-placeholder": "Search networks",
Expand Down Expand Up @@ -501,6 +509,10 @@
"page.sign.keystone.invalid-qrcode": "Invalid QR code",
"page.sign.keystone.select-valid-qrcode": "Please ensure you have selected a valid QR code from your Keystone device.",

"page.sign.keystone.usb.box.unknown-error-title": "Unknown error",
"page.sign.keystone.usb.box.sign-on-keystone-title": "Sign on Keystone",
"page.sign.keystone.usb.box.sign-on-keystone-paragraph": "To proceed, please review and approve the transaction on your Keystone device.",

"page.send.select-asset.title": "Select Asset",
"page.send.select-asset.search-placeholder": "Search for asset or chain",
"page.send.select-asset.hide-ibc-token": "Hide IBC token",
Expand Down
12 changes: 12 additions & 0 deletions apps/extension/src/languages/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
"pages.register.name-password-hardware.connect-to-terra": "테라 앱",
"pages.register.name-password-hardware.connect-to-secret": "시크릿 앱",

"pages.register.name-password-hardware.connect-keystone-way": "Keystone를 통해 연결하세요",
"pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
"pages.register.name-password-hardware.connect-to-keystone-QR": "QR",

"pages.register.recover-mnemonic.title": "기존 지갑 불러오기",
"pages.register.recover-mnemonic.paragraph-1": "복구 문구를 통해 지갑을 불러올 수 있습니다. 아무 칸이나 선택해서 전체 복구 문구를 붙여 넣어보세요.",
"pages.register.recover-mnemonic.paragraph-2": "복구 문구의 단어를 올바른 순서로, 정확한 대소문자, 구두점 기호 혹은 공백으로 기입해야만 지갑을 불러올 수 있습니다.",
Expand Down Expand Up @@ -145,6 +149,10 @@
"pages.register.connect-keystone.tutorial": "튜토리얼",
"pages.register.connect-keystone.unsupported": "미지원",

"pages.register.connect-keystone.usb.title": "하드웨어 지갑을 연결해 주세요.",
"pages.register.connect-keystone.usb.step-1": "키스톤을 연결하고 잠금을 해제하세요.",
"pages.register.connect-keystone.usb.step-2": "귀하의 Keystone 3 Pro가 홈페이지에 있도록 하십시오.",

"pages.register.enable-chains.title": "체인 선택하기",
"pages.register.enable-chains.paragraph": "걱정마세요! 언제든지 사이드바 메뉴에 있는 ‘체인 표시’를 방문해서 설정을 변경할 수 있습니다.",
"pages.register.enable-chains.search-input-placeholder": "네트워크 검색하기",
Expand Down Expand Up @@ -484,6 +492,10 @@
"page.sign.keystone.invalid-qrcode": "QR 코드가 유효하지 않습니다",
"page.sign.keystone.select-valid-qrcode": "키스톤 장치에서 유효한 QR 코드를 선택했는지 확인해주세요.",

"page.sign.keystone.usb.box.unknown-error-title": "알 수 없는 오류",
"page.sign.keystone.usb.box.sign-on-keystone-title": "키스톤에 있는 표지판",
"page.sign.keystone.usb.box.sign-on-keystone-paragraph": "진행하려면, 귀하의 Keystone 기기에서 거래를 검토하고 승인해 주시기 바랍니다.",

"page.send.select-asset.title": "자산 선택",
"page.send.select-asset.search-placeholder": "자산이나 체인 이름 검색",
"page.send.select-asset.hide-ibc-token": "IBC 토큰 숨기기",
Expand Down
12 changes: 12 additions & 0 deletions apps/extension/src/languages/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
"pages.register.name-password-hardware.connect-to-terra": "Terra应用",
"pages.register.name-password-hardware.connect-to-secret": "Secret应用",

"pages.register.name-password-hardware.connect-keystone-way": "选择Keystone连接方式",
"pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
"pages.register.name-password-hardware.connect-to-keystone-QR": "QR",

"pages.register.recover-mnemonic.title": "导入已有钱包",
"pages.register.recover-mnemonic.paragraph-1": "输入助记词,或点击任意输入框并粘贴整个助记词。",
"pages.register.recover-mnemonic.paragraph-2": "按正确的顺序输入助记词,无需大写、标点符号或空格。",
Expand Down Expand Up @@ -139,6 +143,10 @@
"pages.register.connect-keystone.tutorial": "教程",
"pages.register.connect-keystone.unsupported": "暂不支持",

"pages.register.connect-keystone.usb.title": "请连接您的硬件钱包",
"pages.register.connect-keystone.usb.step-1": "连接并解锁您的Keystone.",
"pages.register.connect-keystone.usb.step-2": "确保你的 Keystone 3 Pro 在主页上。",

"pages.register.enable-chains.title": "选择链",
"pages.register.enable-chains.paragraph": "不用担心,你可以随时在侧边栏菜单中的“管理链可见性”中更改你的选择。",
"pages.register.enable-chains.search-input-placeholder": "搜索网络",
Expand Down Expand Up @@ -473,6 +481,10 @@
"page.sign.keystone.invalid-qrcode": "无效的二维码",
"page.sign.keystone.select-valid-qrcode": "请确保你从Keystone设备中选择了正确的二维码。",

"page.sign.keystone.usb.box.unknown-error-title": "未知错误",
"page.sign.keystone.usb.box.sign-on-keystone-title": "Keystone 签名",
"page.sign.keystone.usb.box.sign-on-keystone-paragraph": "要继续,请在你的Keystone设备上查看并确认交易。",

"page.send.select-asset.title": "选择资产",
"page.send.select-asset.search-placeholder": "搜索资产或链",
"page.send.select-asset.hide-ibc-token": "隐藏IBC币种",
Expand Down
3 changes: 2 additions & 1 deletion apps/extension/src/pages/register/connect-keystone/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import { Button } from "../../../components/button";
import { ColorPalette } from "../../../styles";
import { useTheme } from "styled-components";
import { FormattedMessage, useIntl } from "react-intl";
export { ConnectKeystoneUSBScene } from "./usb";

export const ConnectKeystoneScene: FunctionComponent<{
export const ConnectKeystoneQRScene: FunctionComponent<{
name: string;
password: string;
stepPrevious: number;
Expand Down
3 changes: 2 additions & 1 deletion apps/extension/src/pages/register/connect-keystone/scan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ export const ScanKeystoneScene: FunctionComponent<{
const accounts = sdk.parseMultiAccounts(
new UR(Buffer.from(ur.cbor, "hex"), ur.type)
);
const enhancedAccounts = { ...accounts, connectionType: "QR" };
sceneTransition.replaceAll("finalize-key", {
name,
password,
keystone: accounts,
keystone: enhancedAccounts,
stepPrevious: stepPrevious + 1,
stepTotal,
});
Expand Down
Loading
Loading