Merge branch 'dev' into fix/ethereum

Author: mergify[bot]

packages/browser-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension",
-  "version": "0.0.37",
+  "version": "0.0.40",
   "main": "index.js",
   "author": "yqrashawn <namy.19@gmail.com>",
   "license": "MIT",

packages/popup/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "helios-popup",
   "type": "module",
-  "version": "0.1.16",
+  "version": "0.1.19",
   "main": "index.js",
   "author": "yqrashawn <namy.19@gmail.com>",
   "license": "MIT",

packages/popup/src/locales/zh.js

@@ -334,6 +334,8 @@ const zh = {
     priorityConnectionDes: '在连接至 DApp 时，Fluent 将会作为默认钱包',
     showTestnet: '显示测试网络',
     showTestnetDes: '开启后，可在网络列表中展示测试网络',
+    openSidePanel: '侧边栏模式',
+    closeSidePanel: '弹窗模式',
 
     // About
     about: '关于',

packages/popup/src/pages/CreateSeed/BackupSeed.js

@@ -9,6 +9,7 @@ import {TitleNav} from '../../components'
 import {request} from '../../utils'
 import {useCreatedPasswordGuard} from '../../hooks'
 import {RPC_METHODS, ROUTES} from '../../constants'
+import './index.css'
 const {CONFIRM_SEED_PHRASE} = ROUTES
 const {WALLET_GENERATE_MNEMONIC} = RPC_METHODS
 
@@ -30,14 +31,14 @@ function BackupSeed() {
       <TitleNav title={t('newAccount')} />
       <main className="px-3 flex flex-col flex-1 justify-between pt-3">
         <div>
-          <span className="inline-block ml-1 mb-1 text-gray-80">
+          <span className="block ml-1 mb-1 text-gray-80">
             {t('backupSeedTitle')}
           </span>
-          <span className="inline-block ml-1 text-xs text-gray-40">
+          <span className="block ml-1 text-xs text-gray-40">
             <Trans i18nKey="backupSeedContent" />
           </span>
           <div
-            className="mt-4 pt-3 px-3 bg-bg rounded-sm flex flex-wrap justify-between"
+            className="seed-word-container mt-4 pt-3 px-3 bg-bg rounded-sm flex flex-wrap"
             id="mnemonicContainer"
           >
             {mnemonic.split(' ').map((word, index) => (

packages/popup/src/pages/CreateSeed/ConfirmSeed.js

@@ -10,6 +10,7 @@ import {request, shuffle, updateAddedNewAccount} from '../../utils'
 import {useCreatedPasswordGuard} from '../../hooks'
 import useLoading from '../../hooks/useLoading'
 import {RPC_METHODS, ROUTES} from '../../constants'
+import './index.css'
 const {WALLET_IMPORT_MNEMONIC, ACCOUNT_GROUP_TYPE} = RPC_METHODS
 const {HOME} = ROUTES
 
@@ -107,15 +108,15 @@ function ConfirmSeed() {
       <TitleNav title={t('newAccount')} />
       <main className="px-3 pt-3 flex flex-col flex-1 justify-between">
         <div>
-          <span className="inline-block ml-1 mb-1 text-gray-80">
+          <span className="block ml-1 mb-1 text-gray-80">
             {t('confirmSeedTitle')}
           </span>
-          <span className="inline-block ml-1 text-xs text-gray-40">
+          <span className="block ml-1 text-xs text-gray-40">
             {t('confirmSeedContent')}
           </span>
           <div
             id="mnemonicContainer"
-            className={`relative mt-4 px-3 pt-3 bg-bg rounded-sm flex flex-wrap justify-between z-10 ${
+            className={`seed-word-container relative mt-4 px-3 pt-3 bg-bg rounded-sm flex flex-wrap z-10 ${
               mnemonicError
                 ? 'after:absolute after:inset-0 after:border-error after:border after:border-solid after:z-[-1]'
                 : ''
@@ -138,9 +139,9 @@ function ConfirmSeed() {
           )}
           <div
             id="buttonArrayContainer"
-            className={`${
+            className={`seed-word-container ${
               mnemonicError ? 'mt-4' : 'mt-10'
-            } px-3 pt-3 flex flex-wrap justify-between`}
+            } px-3 pt-3 flex flex-wrap`}
           >
             {buttonArray.map((word, index) => (
               <Button

packages/popup/src/pages/CreateSeed/index.css

@@ -0,0 +1,10 @@
+.seed-word-container {
+  justify-content: space-between;
+}
+
+@media (min-width: 548px) {
+  .seed-word-container {
+    gap: 0 10px;
+    justify-content: start;
+  }
+}