Merge branch 'develop'

chainapsis · Dec 12, 2024 · 046fdbf · 046fdbf
2 parents b0d04ee + 633eccc
commit 046fdbf
Show file tree

Hide file tree

Showing 54 changed files with 721 additions and 439 deletions.
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/extension",
-  "version": "0.12.160",
+  "version": "0.12.161-rc.1",
   "author": "chainapsis",
   "license": "Apache-2.0",
   "private": true,
@@ -26,31 +26,31 @@
     "@ethersproject/transactions": "^5.7.0",
     "@floating-ui/react": "^0.23.0",
     "@floating-ui/react-dom": "^1.3.0",
-    "@keplr-wallet/analytics": "0.12.160",
-    "@keplr-wallet/background": "0.12.160",
-    "@keplr-wallet/chain-validator": "0.12.160",
-    "@keplr-wallet/common": "0.12.160",
-    "@keplr-wallet/cosmos": "0.12.160",
-    "@keplr-wallet/crypto": "0.12.160",
-    "@keplr-wallet/hooks": "0.12.160",
-    "@keplr-wallet/hooks-internal": "0.12.160",
-    "@keplr-wallet/hooks-starknet": "0.12.160",
-    "@keplr-wallet/ledger-cosmos": "0.12.160",
-    "@keplr-wallet/popup": "0.12.160",
-    "@keplr-wallet/proto-types": "0.12.160",
-    "@keplr-wallet/provider": "0.12.160",
-    "@keplr-wallet/router": "0.12.160",
-    "@keplr-wallet/router-extension": "0.12.160",
-    "@keplr-wallet/simple-fetch": "0.12.160",
-    "@keplr-wallet/stores": "0.12.160",
-    "@keplr-wallet/stores-core": "0.12.160",
-    "@keplr-wallet/stores-etc": "0.12.160",
-    "@keplr-wallet/stores-eth": "0.12.160",
-    "@keplr-wallet/stores-ibc": "0.12.160",
-    "@keplr-wallet/stores-internal": "0.12.160",
-    "@keplr-wallet/stores-starknet": "0.12.160",
-    "@keplr-wallet/types": "0.12.160",
-    "@keplr-wallet/unit": "0.12.160",
+    "@keplr-wallet/analytics": "0.12.161-rc.1",
+    "@keplr-wallet/background": "0.12.161-rc.1",
+    "@keplr-wallet/chain-validator": "0.12.161-rc.1",
+    "@keplr-wallet/common": "0.12.161-rc.1",
+    "@keplr-wallet/cosmos": "0.12.161-rc.1",
+    "@keplr-wallet/crypto": "0.12.161-rc.1",
+    "@keplr-wallet/hooks": "0.12.161-rc.1",
+    "@keplr-wallet/hooks-internal": "0.12.161-rc.1",
+    "@keplr-wallet/hooks-starknet": "0.12.161-rc.1",
+    "@keplr-wallet/ledger-cosmos": "0.12.161-rc.1",
+    "@keplr-wallet/popup": "0.12.161-rc.1",
+    "@keplr-wallet/proto-types": "0.12.161-rc.1",
+    "@keplr-wallet/provider": "0.12.161-rc.1",
+    "@keplr-wallet/router": "0.12.161-rc.1",
+    "@keplr-wallet/router-extension": "0.12.161-rc.1",
+    "@keplr-wallet/simple-fetch": "0.12.161-rc.1",
+    "@keplr-wallet/stores": "0.12.161-rc.1",
+    "@keplr-wallet/stores-core": "0.12.161-rc.1",
+    "@keplr-wallet/stores-etc": "0.12.161-rc.1",
+    "@keplr-wallet/stores-eth": "0.12.161-rc.1",
+    "@keplr-wallet/stores-ibc": "0.12.161-rc.1",
+    "@keplr-wallet/stores-internal": "0.12.161-rc.1",
+    "@keplr-wallet/stores-starknet": "0.12.161-rc.1",
+    "@keplr-wallet/types": "0.12.161-rc.1",
+    "@keplr-wallet/unit": "0.12.161-rc.1",
     "@keystonehq/animated-qr": "^0.8.6",
     "@keystonehq/hw-app-base": "0.1.1",
     "@keystonehq/hw-transport-webusb": "0.4.0",

diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
@@ -124,10 +124,13 @@
   "pages.register.back-up-private-key.import-button": "Got it",
 
   "pages.register.connect-ledger.title": "Please connect your Hardware wallet",
+  "pages.register.connect-ledger.direct.title": "Connect Keplr to {app} on Ledger",
   "pages.register.connect-ledger.paragraph": "Keplr supports Cosmos app chains, all EVM compatible chains including Ethereum, Injective and Evmos, and Starknet. Ledger connection will guide you through Cosmos, EVM, and Starknet in order.",
+  "pages.register.connect-ledger.direct.paragraph": "This window only appears for users who have previously been using Keplr with their Ledger account but haven’t connected the {app} app. It will NOT appear for any other users.",
   "pages.register.connect-ledger.step-text": "Step {step}",
   "pages.register.connect-ledger.connect-ledger-step-paragraph": "Connect and unlock your Ledger.",
   "pages.register.connect-ledger.open-app-step-paragraph": "Open the {app} app on your Ledger device.",
+  "pages.register.connect-ledger.direct.open-app-step-paragraph": "Open the {app} app on your Ledger device. Refresh {app} dApp site after this process.",
   "pages.register.connect-ledger.use-hid-text": "Use alternative USB connection method(HID)",
   "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",

diff --git a/apps/extension/src/languages/ko.json b/apps/extension/src/languages/ko.json
@@ -124,10 +124,14 @@
   "pages.register.back-up-private-key.import-button": "확인",
 
   "pages.register.connect-ledger.title": "하드웨어 지갑을 연결해주세요.",
+  "pages.register.connect-ledger.direct.title": "렛저 {app} 앱에 케플러를 연결하세요.",
   "pages.register.connect-ledger.paragraph": "케플러는 코스모스 앱체인, Ethereum, Injective와 Evmos를 포함한 모든 EVM 호환 체인, 그리고 Starknet을 지원합니다. Ledger 연결은 코스모스, EVM, Starknet 순서로 진행됩니다.",
+  "pages.register.connect-ledger.direct.paragraph": "이 창은 렛저 계정이지만 {app} 앱을 연결하지 않은 사용자에게만 표시됩니다. 다른 사용자에게는 표시되지 않습니다.",
   "pages.register.connect-ledger.step-text": "{step} 단계",
   "pages.register.connect-ledger.connect-ledger-step-paragraph": "렛저를 연결하고 잠금을 해제하세요.",
   "pages.register.connect-ledger.open-app-step-paragraph": "렛저에서 {app} 앱을 열어주세요.",
+
+  "pages.register.connect-ledger.direct.open-app-step-paragraph": "렛저에서 {app} 앱을 열어주세요. 이 과정 이후에 {app} Dapp 페이지는 새로고침 해주세요.",
   "pages.register.connect-ledger.use-hid-text": " 다른 USB 연결방식 사용하기 (HID)",
   "pages.register.connect-ledger.use-hid-confirm-title": "웹 HID를 사용할 수 없습니다.",
   "pages.register.connect-ledger.use-hid-confirm-paragraph": "웹 HID를 사용하시려면, ‘실험적 웹 플랫폼 기능’을 활성화해야 합니다.",

diff --git a/apps/extension/src/languages/zh-cn.json b/apps/extension/src/languages/zh-cn.json
@@ -118,10 +118,13 @@
   "pages.register.back-up-private-key.import-button": "导入",
 
   "pages.register.connect-ledger.title": "请连接你的硬件钱包",
+  "pages.register.connect-ledger.direct.title": "렛저 {app} 將 Keplr 連接到應用程式。",
   "pages.register.connect-ledger.paragraph": "Keplr 支援 Cosmos 應用程式鏈、所有 EVM 相容鏈，包括 Ethereum、Injective 和 Evmos，以及 Starknet。Ledger connection 會引導您依序瀏覽 Cosmos、EVM 和 Starknet。",
+  "pages.register.connect-ledger.direct.paragraph": "此視窗僅對之前使用 Keplr 與 Ledger 帳戶但未連接 {app} 應用程式的使用者可見。其他使用者則無法看到。",
   "pages.register.connect-ledger.step-text": "步骤 {step}",
   "pages.register.connect-ledger.connect-ledger-step-paragraph": "连接并解锁你的Ledger。",
   "pages.register.connect-ledger.open-app-step-paragraph": "在你的Ledger设备上打开{app}应用。",
+  "pages.register.connect-ledger.direct.open-app-step-paragraph": "在您的 Ledger 裝置上開啟 {app} 應用程式。完成此程序後，刷新 {app} dApp 網站。",
   "pages.register.connect-ledger.use-hid-text": "使用替代的USB连接方法（HID）",
   "pages.register.connect-ledger.use-hid-confirm-title": "无法使用Web HID",
   "pages.register.connect-ledger.use-hid-confirm-paragraph": "请启用“实验性Web平台功能”以使用Web HID",

diff --git a/apps/extension/src/manifest.v2.json b/apps/extension/src/manifest.v2.json
@@ -3,7 +3,7 @@
 
   "name": "Keplr",
   "description": "Keplr is a browser extension wallet for the Inter blockchain ecosystem.",
-  "version": "0.12.160",
+  "version": "0.12.161",
   "icons": {
     "16": "assets/icon-16.png",
     "48": "assets/icon-48.png",

diff --git a/apps/extension/src/manifest.v3.json b/apps/extension/src/manifest.v3.json
@@ -3,7 +3,7 @@
 
   "name": "Keplr",
   "description": "Keplr is a browser extension wallet for the Inter blockchain ecosystem.",
-  "version": "0.12.160",
+  "version": "0.12.161",
   "icons": {
     "16": "assets/icon-16.png",
     "48": "assets/icon-48.png",

diff --git a/apps/extension/src/pages/register/components/header/header.tsx b/apps/extension/src/pages/register/components/header/header.tsx
@@ -76,6 +76,20 @@ export const RegisterHeader: FunctionComponent<{
           }
           break;
         }
+        case "direct": {
+          if (headerSceneRef.current.currentScene !== "direct") {
+            headerSceneRef.current.replace("direct", {
+              title: header.title,
+              paragraphs: header.paragraphs,
+            });
+          } else {
+            headerSceneRef.current.setCurrentSceneProps({
+              title: header.title,
+              paragraphs: header.paragraphs,
+            });
+          }
+          break;
+        }
       }
     }
   }, [header]);
@@ -151,9 +165,13 @@ export const RegisterHeader: FunctionComponent<{
             name: "step",
             element: HeaderStep,
           },
+          {
+            name: "direct",
+            element: HeaderDirect,
+          },
         ]}
         initialSceneProps={{
-          name: "intro",
+          name: header.mode,
         }}
         transitionAlign="center"
         transitionMode="opacity"
@@ -303,6 +321,65 @@ const HeaderStep: FunctionComponent<{
   );
 };
 
+const HeaderDirect: FunctionComponent<{
+  title: string;
+  paragraphs?: (string | ReactNode)[];
+}> = ({ title, paragraphs }) => {
+  return (
+    <Box position="relative">
+      <YAxis alignX="center">
+        <RegisterH3>{title}</RegisterH3>
+      </YAxis>
+      <Box width="29.5rem" marginX="auto">
+        <VerticalResizeTransition>
+          {paragraphs && paragraphs.length > 0 ? (
+            <Gutter size="1.25rem" />
+          ) : null}
+        </VerticalResizeTransition>
+        <VerticalResizeTransition transitionAlign="top">
+          {(() => {
+            if (paragraphs && paragraphs.length > 0) {
+              if (paragraphs.length === 1) {
+                return (
+                  <Body1
+                    color={ColorPalette["gray-300"]}
+                    style={{
+                      textAlign: "center",
+                    }}
+                  >
+                    {paragraphs[0]}
+                  </Body1>
+                );
+              }
+
+              return (
+                <YAxis alignX="center">
+                  <ul>
+                    {paragraphs.map((paragraph, i) => {
+                      return (
+                        <Body1
+                          key={i}
+                          as="li"
+                          color={ColorPalette["gray-300"]}
+                          style={{ marginTop: i > 0 ? "0.5rem" : "0" }}
+                        >
+                          {paragraph}
+                        </Body1>
+                      );
+                    })}
+                  </ul>
+                </YAxis>
+              );
+            }
+
+            return null;
+          })()}
+        </VerticalResizeTransition>
+      </Box>
+    </Box>
+  );
+};
+
 const BackButton: FunctionComponent<{
   sceneRef: MutableRefObject<SceneTransitionRef | null>;
 }> = ({ sceneRef }) => {

diff --git a/apps/extension/src/pages/register/components/header/types.ts b/apps/extension/src/pages/register/components/header/types.ts
@@ -18,6 +18,11 @@ export type Header =
       paragraphs?: (string | ReactNode)[];
       stepCurrent: number;
       stepTotal: number;
+    }
+  | {
+      mode: "direct";
+      title?: string;
+      paragraphs?: (string | ReactNode)[];
     };
 
 export interface HeaderContext {