@arcblock/ux 2.10.46 → 2.10.48

package/lib/Blocklet/blocklet.js

@@ -90,7 +90,7 @@ const Div = styled('div')`
     padding-bottom: ${props => props.theme.spacing(2)};
   }
   .arcblock-blocklet__text {
-    height: 57px;
+    height: 65px;
     overflow: hidden;
   }
   /* 设置多行文本溢出显示省略号 兼容fireFox、safari */

package/lib/DID/index.d.ts

@@ -17,6 +17,7 @@ interface IDIDPropTypes extends IDidAddressWrapper {
     endChars?: number;
     locale?: 'en' | 'zh';
     chainId?: string;
+    roleType?: number;
 }
 export interface HTMLDIDElement extends HTMLDidAddressElement {
     openQRCode: () => void;

package/lib/DID/index.js

@@ -15,7 +15,7 @@ import { translate } from '../Locale/util';
 import { getDIDColor, isEthereumDid } from '../Util';
 const translations = {
   en: {
-    scanQrcode: 'Scan with DID Wallet to view this {role}',
+    scanQrcode: 'Scan with DID Wallet to view the {role}',
     download: 'Download',
     downloadTips: "Don't have DID Wallet ?"
   },
@@ -47,6 +47,9 @@ const isSquareMotif = roleType => {
   return !roles[roleType];
 };
 const getRoleName = roleType => {
+  if (roleType === types.RoleType.ROLE_ANY) {
+    return 'DID';
+  }
   const [roleName] = Object.entries(types.RoleType).find(item => item[1] === roleType) || [];
   if (roleName) {
     // UpperCase first word, example:
@@ -54,7 +57,7 @@ const getRoleName = roleType => {
     // ROLE_APPLICATION -> Application
     return roleName.toLowerCase().replace(/role_(\S)/g, (_, $1) => $1.toUpperCase());
   }
-  return 'Address';
+  return 'DID';
 };
 const getAvatarSize = (didMotifInfo, isEthDid, size) => {
   if (isEthDid) {
@@ -223,7 +226,7 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
             fontSize: 18
           },
           children: t('scanQrcode', {
-            role: getRoleName(didMotifInfo?.roleType)
+            role: getRoleName(props.roleType || didMotifInfo?.roleType)
           })
         }), /*#__PURE__*/_jsx(QRCode
         // eslint-disable-next-line max-len

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.10.46",
+  "version": "2.10.48",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -64,12 +64,12 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "ae503a7f61a29ddfe9fdc5a1b0e040fa5890dc75",
+  "gitHead": "cf51a0c10a0db976cde5ea88c0c7f9bc9aad6895",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.46",
-    "@arcblock/nft-display": "^2.10.46",
-    "@arcblock/react-hooks": "^2.10.46",
+    "@arcblock/icons": "^2.10.48",
+    "@arcblock/nft-display": "^2.10.48",
+    "@arcblock/react-hooks": "^2.10.48",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@fontsource/inter": "^5.0.16",
     "@fontsource/ubuntu-mono": "^5.0.18",

package/src/Blocklet/blocklet.js

@@ -91,7 +91,7 @@ const Div = styled('div')`
     padding-bottom: ${(props) => props.theme.spacing(2)};
   }
   .arcblock-blocklet__text {
-    height: 57px;
+    height: 65px;
     overflow: hidden;
   }
   /* 设置多行文本溢出显示省略号 兼容fireFox、safari */

package/src/DID/index.tsx

@@ -18,7 +18,7 @@ import { getDIDColor, isEthereumDid } from '../Util';
 
 const translations = {
   en: {
-    scanQrcode: 'Scan with DID Wallet to view this {role}',
+    scanQrcode: 'Scan with DID Wallet to view the {role}',
     download: 'Download',
     downloadTips: "Don't have DID Wallet ?",
   },
@@ -45,6 +45,7 @@ interface IDIDPropTypes extends IDidAddressWrapper {
   endChars?: number;
   locale?: 'en' | 'zh';
   chainId?: string;
+  roleType?: number;
 }
 
 const DEFAULT_CHAIN_ID = 'xenon-2020-01-15';
@@ -72,8 +73,11 @@ const isSquareMotif = (roleType: number) => {
 };
 
 const getRoleName = (roleType: number) => {
-  const [roleName] = Object.entries(types.RoleType).find((item) => item[1] === roleType) || [];
+  if (roleType === types.RoleType.ROLE_ANY) {
+    return 'DID';
+  }
 
+  const [roleName] = Object.entries(types.RoleType).find((item) => item[1] === roleType) || [];
   if (roleName) {
     // UpperCase first word, example:
     // ROLE_ACCOUNT -> Account
@@ -81,7 +85,7 @@ const getRoleName = (roleType: number) => {
     return roleName.toLowerCase().replace(/role_(\S)/g, (_, $1) => $1.toUpperCase());
   }
 
-  return 'Address';
+  return 'DID';
 };
 
 const getAvatarSize = (didMotifInfo: any, isEthDid: boolean, size: number) => {
@@ -268,7 +272,7 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
         {/* @ts-ignore */}
         <DialogContent align="center" sx={{ p: 3 }}>
           <Typography sx={{ mb: 2, fontWeight: 500, fontSize: 18 }}>
-            {t('scanQrcode', { role: getRoleName(didMotifInfo?.roleType) })}
+            {t('scanQrcode', { role: getRoleName(props.roleType || didMotifInfo?.roleType) })}
           </Typography>
           <QRCode
             // eslint-disable-next-line max-len