Merge branch 'develop' into fix-288

.ckb-version

@@ -1 +1 @@
-v0.112.1
+v0.113.0

_typos.toml

@@ -6,4 +6,4 @@ numer = "numer"
 lastest = "lastest"
 
 [files]
-extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts"]
+extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts", "**/fr.{ts,json}"]

compatible.json

@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.113",
     "0.112",
     "0.111",
     "0.110",
@@ -18,6 +19,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",
@@ -30,6 +32,7 @@
     },
     "0.110": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",
@@ -58,6 +61,7 @@
     },
     "0.112": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",

packages/neuron-ui/.storybook/electron.js

@@ -1,5 +1,5 @@
 const sendSyncValues = {
-  'get-locale': 'zh',
+  'get-locale': ('zh', 'fr'),
   'get-version': '0.103.1',
 }
 

packages/neuron-ui/src/components/MultisigAddress/hooks.ts

@@ -335,7 +335,7 @@ export const useSubscription = ({
         const tmp: Record<string, number> = {}
         res.result.forEach(v => {
           if (hashToPayload[v.hash]) {
-            tmp[hashToPayload[v.hash]] = v.blockStartNumber
+            tmp[hashToPayload[v.hash]] = v.localSavedBlockNumber
           }
         })
         setMultisigSyncProgress(tmp)

packages/neuron-ui/src/components/Receive/index.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react'
+import React, { useMemo, useCallback, useState, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState } from 'states'
 import Dialog from 'widgets/Dialog'
@@ -7,50 +7,82 @@ import Button from 'widgets/Button'
 import CopyZone from 'widgets/CopyZone'
 import QRCode from 'widgets/QRCode'
 import Tooltip from 'widgets/Tooltip'
-import { AddressTransform, Download, Copy, Attention } from 'widgets/Icons/icon'
+import { AddressTransform, Download, Copy, Attention, SuccessNoBorder } from 'widgets/Icons/icon'
 import VerifyHardwareAddress from './VerifyHardwareAddress'
 import styles from './receive.module.scss'
 import { useCopyAndDownloadQrCode, useSwitchAddress } from './hooks'
 
 type AddressTransformWithCopyZoneProps = {
   showAddress: string
   isInShortFormat: boolean
-  className?: string
   onClick: () => void
 }
 
-export const AddressTransformWithCopyZone = ({
+export const AddressQrCodeWithCopyZone = ({
   showAddress,
   isInShortFormat,
   onClick,
-  className,
 }: AddressTransformWithCopyZoneProps) => {
   const [t] = useTranslation()
   const transformLabel = t(
     isInShortFormat ? 'receive.turn-into-full-version-format' : 'receive.turn-into-deprecated-format'
   )
 
+  const [isCopySuccess, setIsCopySuccess] = useState(false)
+  const timer = useRef<ReturnType<typeof setTimeout>>()
+  const { ref, onCopyQrCode, onDownloadQrCode, showCopySuccess } = useCopyAndDownloadQrCode()
+
   const stopPropagation = useCallback((e: React.SyntheticEvent) => {
     e.stopPropagation()
   }, [])
+  const onCopy = useCallback(() => {
+    onCopyQrCode()
+    setIsCopySuccess(true)
+
+    clearTimeout(timer.current!)
+    timer.current = setTimeout(() => {
+      setIsCopySuccess(false)
+    }, 1000)
+  }, [showAddress, setIsCopySuccess, timer])
 
   return (
-    <div className={className}>
-      <CopyZone content={showAddress} className={styles.showAddress}>
-        {showAddress}
-      </CopyZone>
-      <button
-        type="button"
-        className={styles.addressToggle}
-        onClick={onClick}
-        title={transformLabel}
-        onFocus={stopPropagation}
-        onMouseOver={stopPropagation}
-        onMouseUp={stopPropagation}
-      >
-        <AddressTransform />
-        {transformLabel}
-      </button>
+    <div className={styles.addressRoot}>
+      <div className={styles.qrCode} data-copy-success-text={t('common.copied')}>
+        <QRCode value={showAddress} size={128} includeMargin ref={ref} />
+        <div className={styles.actions}>
+          <Button type="text" className={styles.actionBtn} onClick={onDownloadQrCode}>
+            <Download />
+          </Button>
+          {isCopySuccess ? (
+            <Button type="text">
+              <SuccessNoBorder />
+            </Button>
+          ) : (
+            <Button type="text" className={styles.actionBtn} onClick={onCopy}>
+              <Copy />
+            </Button>
+          )}
+        </div>
+        {showCopySuccess && <Toast content={t('common.copied')} />}
+      </div>
+
+      <div className={styles.copyAddress}>
+        <CopyZone content={showAddress} className={styles.showAddress}>
+          {showAddress}
+        </CopyZone>
+        <button
+          type="button"
+          className={styles.addressToggle}
+          onClick={onClick}
+          title={transformLabel}
+          onFocus={stopPropagation}
+          onMouseOver={stopPropagation}
+          onMouseUp={stopPropagation}
+        >
+          <AddressTransform />
+          {transformLabel}
+        </button>
+      </div>
     </div>
   )
 }
@@ -73,7 +105,6 @@ const Receive = ({ onClose, address }: { onClose?: () => void; address?: string
   }
 
   const { isInShortFormat, setIsInShortFormat, address: showAddress } = useSwitchAddress(accountAddress)
-  const { ref, onCopyQrCode, onDownloadQrCode, showCopySuccess } = useCopyAndDownloadQrCode()
 
   return (
     <Dialog
@@ -90,35 +121,15 @@ const Receive = ({ onClose, address }: { onClose?: () => void; address?: string
       showFooter={false}
       className={styles.dialog}
     >
-      <div className={styles.addressRoot}>
-        <div className={styles.qrCode} data-copy-success-text={t('common.copied')}>
-          <QRCode value={showAddress} size={128} includeMargin ref={ref} />
-        </div>
-
-        <div className={styles.actions}>
-          <Button type="text" onClick={onDownloadQrCode}>
-            <Tooltip tip={t('receive.save-qr-code')} placement="top">
-              <Download />
-            </Tooltip>
-          </Button>
-          <Button type="text" onClick={onCopyQrCode}>
-            <Tooltip tip={t('receive.copy-address')} placement="top">
-              <Copy />
-            </Tooltip>
-          </Button>
-        </div>
-        <div className={styles.copyAddress}>
-          <AddressTransformWithCopyZone
-            showAddress={showAddress}
-            isInShortFormat={isInShortFormat}
-            onClick={() => setIsInShortFormat(is => !is)}
-          />
-        </div>
+      <div>
+        <AddressQrCodeWithCopyZone
+          showAddress={showAddress}
+          isInShortFormat={isInShortFormat}
+          onClick={() => setIsInShortFormat(is => !is)}
+        />
 
         {isSingleAddress && <VerifyHardwareAddress address={accountAddress} wallet={wallet} onClose={onClose} />}
       </div>
-
-      {showCopySuccess && <Toast content={t('common.copied')} />}
     </Dialog>
   )
 }

packages/neuron-ui/src/components/Receive/receive.module.scss

@@ -24,24 +24,41 @@
   margin: 4px 0;
 
   .actions {
+    position: absolute;
+    width: 128px;
+    height: 128px;
+    top: 0;
+    left: 46px;
     display: flex;
     justify-content: center;
-    gap: 16px;
-    margin-top: 8px;
+    align-items: center;
+    gap: 24px;
+    &:hover {
+      background: rgba(0, 0, 0, 0.5);
+      & > button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
     & > button {
+      display: none;
       min-width: 0;
       width: 24px;
       height: 24px;
       border-radius: 50%;
       color: var(--primary-color);
       background: var(--tag-green-bg-color);
-      & {
-        svg {
-          width: 12px;
-          g,
-          path {
-            fill: var(--primary-color);
-          }
+      svg {
+        width: 12px;
+      }
+    }
+
+    .actionBtn {
+      svg {
+        g,
+        path {
+          fill: var(--primary-color);
         }
       }
     }
@@ -94,6 +111,7 @@
 
 .copyAddress {
   width: 424px;
+  margin-top: 16px;
 }
 
 .showAddress {

packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx

@@ -1,11 +1,9 @@
-import React, { useCallback, useRef, useState } from 'react'
+import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { addressToScript, bech32Address, AddressPrefix } from '@nervosnetwork/ckb-sdk-utils'
 import SUDTAvatar from 'widgets/SUDTAvatar'
-import { AddressTransformWithCopyZone } from 'components/Receive'
-import QRCode, { copyCanvas, downloadCanvas } from 'widgets/QRCode'
+import { AddressQrCodeWithCopyZone } from 'components/Receive'
 import Dialog from 'widgets/Dialog'
-import Button from 'widgets/Button'
 import Alert from 'widgets/Alert'
 
 import { CONSTANTS } from 'utils'
@@ -37,24 +35,6 @@ const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () =>
   const [t] = useTranslation()
   const [isInShortFormat, setIsInShortFormat] = useState(false)
   const { address, accountName, tokenName, symbol } = data
-  const ref = useRef<HTMLDivElement | null>(null)
-  const onDownloadQrCode = useCallback(() => {
-    const canvasElement = ref.current?.querySelector('canvas')
-    if (canvasElement) {
-      downloadCanvas(canvasElement)
-    }
-  }, [ref])
-  const [showCopySuccess, setShowCopySuccess] = useState(false)
-  const onCopyQrCode = useCallback(() => {
-    setShowCopySuccess(false)
-    const canvasElement = ref.current?.querySelector('canvas')
-    if (canvasElement) {
-      copyCanvas(canvasElement)
-      setTimeout(() => {
-        setShowCopySuccess(true)
-      }, 1)
-    }
-  }, [ref])
 
   const displayedAddr = isInShortFormat ? toShortAddr(address) : address
 
@@ -82,21 +62,12 @@ const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () =>
             </div>
           </div>
         </div>
-        <div className={styles.qrCode} data-copy-success={showCopySuccess} data-copy-success-text={t('common.copied')}>
-          <QRCode value={displayedAddr} size={128} includeMargin ref={ref} />
-        </div>
-        <div className={styles.copyContainer}>
-          <AddressTransformWithCopyZone
-            className={styles.copyTransformWrapper}
-            showAddress={displayedAddr}
-            isInShortFormat={isInShortFormat}
-            onClick={() => setIsInShortFormat(is => !is)}
-          />
-        </div>
-        <div className={styles.actions}>
-          <Button type="default" label={t('receive.copy-qr-code')} onClick={onCopyQrCode} />
-          <Button type="confirm" label={t('receive.save-qr-code')} onClick={onDownloadQrCode} />
-        </div>
+
+        <AddressQrCodeWithCopyZone
+          showAddress={displayedAddr}
+          isInShortFormat={isInShortFormat}
+          onClick={() => setIsInShortFormat(is => !is)}
+        />
       </div>
     </Dialog>
   )

packages/neuron-ui/src/components/SUDTReceiveDialog/sUDTReceiveDialog.module.scss

@@ -10,6 +10,7 @@
 
 .container {
   width: 680px;
+  padding-bottom: 24px;
 }
 
 .info {
@@ -75,18 +76,6 @@
   }
 }
 
-.copyContainer {
-  text-align: center;
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  margin-top: 16px;
-
-  .copyTransformWrapper {
-    width: 452px;
-  }
-}
-
 .qrCode {
   position: relative;
   @keyframes fade-away {
@@ -125,9 +114,3 @@
     }
   }
 }
-
-.actions {
-  margin: 16px 0 24px;
-  @include dialog-footer;
-  column-gap: 24px;
-}

packages/neuron-ui/src/locales/en.json

@@ -417,7 +417,8 @@
         "en": "English",
         "en-US": "English(United States)",
         "zh": "中文(简体)",
-        "zh-TW": "中文(繁體)"
+        "zh-TW": "中文(繁體)",
+        "fr": "Français"
       },
       "data": {
         "ckb-node-data": "CKB Node Config & Storage",