Merge branch 'develop' into fix-spell

nervosnetwork · Jun 28, 2023 · 12f51e4 · 12f51e4
2 parents 2edbf59 + 232b947
commit 12f51e4
Show file tree

Hide file tree

Showing 45 changed files with 1,803 additions and 2,014 deletions.
diff --git a/.github/workflows/add-replied-label.yml b/.github/workflows/add-replied-label.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - id: check-access
         name: Check if the commenter is a collaborator
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         with:
           script: |
             try{
@@ -30,7 +30,7 @@ jobs:
 
       - id: check-issue
         name: Check if the comment is replied in an issue
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         with:
           script: |
             const response = await github.issues.get({
@@ -45,7 +45,7 @@ jobs:
       - id: add-label
         name: Add 'replied' label
         if: ${{ steps.check-access.outputs.result == 'true' && steps.check-issue.outputs.result == 'true' }}
-        uses: actions/github-script@v4
+        uses: actions/github-script@v6
         with:
           script: |
             await github.issues.addLabels({

diff --git a/package.json b/package.json
@@ -42,15 +42,15 @@
     "@types/jest": "27.5.2",
     "@types/node": "18.16.18",
     "@types/npmlog": "4.1.4",
-    "@typescript-eslint/eslint-plugin": "5.58.0",
-    "@typescript-eslint/parser": "5.58.0",
+    "@typescript-eslint/eslint-plugin": "5.60.1",
+    "@typescript-eslint/parser": "5.60.1",
     "concurrently": "8.2.0",
     "cross-env": "7.0.3",
     "eslint": "8.38.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
-    "lerna": "7.0.2",
+    "lerna": "7.1.0",
     "lint-staged": "13.2.2",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
@@ -65,6 +65,6 @@
     "usb": "1.8.8"
   },
   "volta": {
-    "node": "18.16.0"
+    "node": "18.16.1"
   }
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -29,12 +29,12 @@
   },
   "lint-staged": {
     "src/**/*.{js,cjs,mjs,jsx,ts,tsx}": [
-      "prettier --write",
+      "prettier --ignore-path ../../.prettierignore --write",
       "eslint --fix",
       "git add"
     ],
     "src/**/*.{css,scss}": [
-      "prettier --write",
+      "prettier --ignore-path ../../.prettierignore --write",
       "git add"
     ]
   },
@@ -45,8 +45,8 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.107.0",
-    "@nervosnetwork/ckb-sdk-utils": "0.107.0",
+    "@nervosnetwork/ckb-sdk-core": "0.109.0",
+    "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",
     "i18next": "21.10.0",
     "immer": "9.0.21",
@@ -56,25 +56,25 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "12.1.5",
-    "react-router-dom": "6.4.1",
+    "react-router-dom": "6.14.0",
     "react-transition-group": "4.4.5",
-    "sass": "1.62.0"
+    "sass": "1.63.6"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
-    "@babel/preset-typescript": "7.18.6",
-    "@storybook/addon-actions": "6.5.12",
-    "@storybook/addon-essentials": "6.5.12",
-    "@storybook/addon-interactions": "6.5.12",
-    "@storybook/addon-links": "6.5.12",
-    "@storybook/builder-webpack4": "6.5.12",
-    "@storybook/builder-webpack5": "6.5.12",
-    "@storybook/manager-webpack4": "6.5.12",
-    "@storybook/manager-webpack5": "6.5.12",
-    "@storybook/node-logger": "6.5.12",
+    "@babel/preset-typescript": "7.22.5",
+    "@storybook/addon-actions": "6.5.16",
+    "@storybook/addon-essentials": "6.5.16",
+    "@storybook/addon-interactions": "6.5.16",
+    "@storybook/addon-links": "6.5.16",
+    "@storybook/builder-webpack4": "6.5.16",
+    "@storybook/builder-webpack5": "6.5.16",
+    "@storybook/manager-webpack4": "6.5.16",
+    "@storybook/manager-webpack5": "6.5.16",
+    "@storybook/node-logger": "6.5.16",
     "@storybook/preset-create-react-app": "4.1.2",
-    "@storybook/react": "6.5.12",
-    "@storybook/testing-library": "0.0.13",
+    "@storybook/react": "6.5.16",
+    "@storybook/testing-library": "0.2.0",
     "@types/enzyme": "3.10.13",
     "@types/enzyme-adapter-react-16": "1.0.6",
     "@types/node": "18.16.18",
@@ -84,7 +84,7 @@
     "@types/styled-components": "5.1.26",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "24.5.1",
+    "electron": "24.6.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",
@@ -96,7 +96,7 @@
     "react-scripts": "5.0.1",
     "react-test-renderer": "16.14.0",
     "storybook-addon-react-router-v6": "0.2.1",
-    "webpack": "5.74.0"
+    "webpack": "5.88.0"
   },
   "resolutions": {
     "react-i18next": "12.1.5"

diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
@@ -149,7 +149,7 @@ const History = () => {
         return (
           <div className={styles.avatarBox}>
             {item.sudtInfo?.sUDT ? (
-              <SUDTAvatar name={name} type="token" style={{ width: '30px', height: '30px', borderRadius: '50%' }} />
+              <SUDTAvatar name={name} type="token" style={{ width: '30px', height: '30px' }} />
             ) : (
               <CKBAvatar />
             )}

diff --git a/packages/neuron-ui/src/components/Overview/overview.module.scss b/packages/neuron-ui/src/components/Overview/overview.module.scss
@@ -12,7 +12,7 @@
   .balance {
     grid-area: balance;
     border-radius: 16px;
-    background-color: #26C786;
+    background-color: #26c786;
     position: relative;
     padding: 24px 16px;
     color: var(--primary-text-color);
@@ -77,7 +77,7 @@
           fill: var(--primary-color);
         }
         :not(:first-child) {
-          fill: #14221C;
+          fill: #14221c;
         }
       }
     }
@@ -99,8 +99,8 @@
     margin-right: 4px;
   }
 
-  &[data-status="failed"] {
-    color: #FF1E1E;
+  &[data-status='failed'] {
+    color: #ff1e1e;
   }
 }
 
@@ -136,7 +136,7 @@
 
   .linkToHistory {
     font-size: 14px;
-    color: #8DA394;
+    color: #8da394;
     cursor: pointer;
 
     &:hover {

diff --git a/packages/neuron-ui/src/components/Receive/multiAddressReceive.tsx b/packages/neuron-ui/src/components/Receive/multiAddressReceive.tsx
@@ -27,12 +27,9 @@ const MultiAddressReceive = ({
   const dispatch = useDispatch()
   const { isInShortFormat, setIsInShortFormat, address: showAddress } = useSwitchAddress(address)
   const { ref, showCopySuccess, onCopyQrCode, onDownloadQrCode } = useCopyAndDownloadQrCode()
-  const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionSelected } = useLocalDescription(
-    'address',
-    walletId,
-    dispatch,
-    'textarea'
-  )
+  const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionFieldBlur, onDescriptionSelected } =
+    useLocalDescription('address', walletId, dispatch, 'textarea')
+
   const columns = useMemo<TableProps<State.Address>['columns']>(
     () => [
       {
@@ -109,6 +106,7 @@ const MultiAddressReceive = ({
                       value={isSelected ? localDescription.description : description}
                       onChange={onDescriptionChange}
                       onKeyDown={onDescriptionPress}
+                      onBlur={onDescriptionFieldBlur}
                     />
                     <Edit
                       data-description-key={item.address}
@@ -146,7 +144,7 @@ const MultiAddressReceive = ({
         <div className={styles.qrCode} data-copy-success={showCopySuccess} data-copy-success-text={t('common.copied')}>
           <QRCode value={showAddress} size={128} includeMargin ref={ref} />
         </div>
-        <CopyZone content={showAddress} name={t('receive.copy-address')} className={styles.copyAddress}>
+        <CopyZone content={showAddress} className={styles.copyAddress}>
           {showAddress}
           <button
             type="button"

diff --git a/packages/neuron-ui/src/components/Receive/receive.module.scss b/packages/neuron-ui/src/components/Receive/receive.module.scss
@@ -21,7 +21,7 @@
     padding: 8px;
     border: 1px solid rgba(252, 136, 0, 0.2);
     border-radius: 4px;
-    color: #FF9737;
+    color: #ff9737;
     text-align: center;
     font-size: 12px;
     line-height: 20px;
@@ -35,10 +35,10 @@
 
     @media (prefers-color-scheme: dark) {
       background: rgba(255, 140, 0, 0.2);
-      color: #F78C2A;
+      color: #f78c2a;
       & > svg {
         path {
-          fill: #F78C2A;
+          fill: #f78c2a;
         }
       }
     }
@@ -49,7 +49,7 @@
     flex-direction: column;
     row-gap: 16px;
     align-items: center;
-  
+
     & > button {
       width: 216px;
     }
@@ -92,7 +92,7 @@
   .copyTableAddress {
     word-break: break-all;
     text-align: center;
-    font-family: "JetBrains Mono";
+    font-family: 'JetBrains Mono';
     width: 300px;
     white-space: normal;
     line-height: 24px;
@@ -120,7 +120,7 @@
       cursor: pointer;
       margin-left: 4px;
       g {
-        fill: var(--primary-color)
+        fill: var(--primary-color);
       }
     }
     .descText {
@@ -153,8 +153,10 @@
       background-color: transparent;
       color: var(--main-text-color);
       caret-color: #000000;
+      pointer-events: none;
+
       @media (prefers-color-scheme: dark) {
-        caret-color: #FFF;
+        caret-color: #fff;
       }
     }
     & > .hidden {
@@ -176,14 +178,14 @@
       visibility: visible;
       opacity: 1;
     }
-  
+
     to {
       visibility: visible;
       opacity: 0;
     }
   }
 
-  &[data-copy-success="true"] {
+  &[data-copy-success='true'] {
     &::after {
       position: absolute;
       left: 50%;
@@ -203,7 +205,7 @@
       text-align: center;
       content: attr(data-copy-success-text);
       animation: 4s fade-away 1 forwards;
-      color: #FFF;
+      color: #fff;
     }
   }
 }
@@ -213,9 +215,9 @@
   text-align: center;
   margin: 32px 16px 82px 16px;
   line-height: 24px;
-  font-family: "JetBrains Mono";
+  font-family: 'JetBrains Mono';
 
-  .addressToggle{
+  .addressToggle {
     margin: 0 0 0 4px;
     padding: 0;
     vertical-align: sub;
@@ -226,7 +228,7 @@
     svg {
       pointer-events: none;
     }
-  
+
     &:hover {
       & + div {
         display: none;
@@ -240,7 +242,7 @@
   text-align: center;
   @include card;
   &::before {
-    content: "";
+    content: '';
     display: block;
     height: 176px;
   }
@@ -279,8 +281,8 @@
     .qrCode {
       margin-top: 38px;
     }
-  
-    .addressCopy {
+
+    .copyAddress {
       margin: 16px 16px 26px 16px;
     }
   }