@arcblock/did-connect-react 3.4.2 → 3.4.4

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const o = "3.4.2", s = {
+const o = "3.4.4", s = {
   version: o
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,17 +32,17 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.4.2",
-    "@arcblock/did": "^1.28.1",
-    "@arcblock/icons": "3.4.2",
-    "@arcblock/react-hooks": "3.4.2",
-    "@arcblock/ws": "^1.28.1",
+    "@arcblock/bridge": "3.4.4",
+    "@arcblock/did": "^1.28.2",
+    "@arcblock/icons": "3.4.4",
+    "@arcblock/react-hooks": "3.4.4",
+    "@arcblock/ws": "^1.28.2",
     "@blocklet/constant": "^1.17.7",
     "@fontsource/lexend": "^5.2.9",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^5.2.1",
-    "@ocap/util": "^1.28.1",
+    "@ocap/util": "^1.28.2",
     "@simplewebauthn/browser": "^13.1.0",
     "ahooks": "^3.8.5",
     "axios": "^1.10.0",
@@ -81,5 +81,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "9ba657c3d15f93dc93e9029845631ececf385afc"
+  "gitHead": "89a650622cb03211e105d8d9ac7793ccf18aac4f"
 }

package/src/Connect/components/login-item/connect-provider-list.jsx

@@ -162,10 +162,10 @@ export default function ConnectProviderList({
   }, [providerList]);
 
   useEffect(() => {
-    if (onlyWalletProvider && !browser.mobile.any && !showWalletOptions) {
+    if (hideQRCode && onlyWalletProvider && !browser.mobile.any && !showWalletOptions) {
       setShowWalletOptions(true);
     }
-  }, [onlyWalletProvider, browser.mobile.any, setShowWalletOptions, showWalletOptions]);
+  }, [hideQRCode, onlyWalletProvider, browser.mobile.any, setShowWalletOptions, showWalletOptions]);
 
   const showEmailLogin = providerList.some((p) => p.provider === LOGIN_PROVIDER.EMAIL);
 

package/src/Connect/hooks/provider-list.js

@@ -59,7 +59,8 @@ export default function useProviderList({
   lastLoginMethod = '',
 }) {
   const [loadingProviderList, setLoadingProviderList] = useState(false);
-  const actionList = ['login', 'invite', 'connect-to-did-space', 'connect-to-did-domain', 'destroy-self'];
+  const oauthActionList = ['login', 'invite', 'connect-to-did-space', 'connect-to-did-domain', 'destroy-self'];
+  const emailActionList = ['login', 'invite', 'connect-to-did-space', 'connect-to-did-domain', 'destroy-self'];
   const browser = useBrowser();
 
   const { data: loginProviderList = [] } = useRequest(
@@ -75,18 +76,18 @@ export default function useProviderList({
   const showedLoginProviderList = useCreation(() => {
     const result = loginProviderList
       .filter((item) => {
-        if (item.name === LOGIN_PROVIDER.WALLET) {
+        if (item.provider === LOGIN_PROVIDER.WALLET) {
           return allowWallet;
         }
-        if (item.name === LOGIN_PROVIDER.PASSKEY) {
+        if (item.provider === LOGIN_PROVIDER.PASSKEY) {
           return passkeyBehavior !== 'none' && !browser.wallet && !browser.arcSphere;
         }
-        if (item.name === LOGIN_PROVIDER.EMAIL) {
-          return blocklet?.settings?.notification?.email?.enabled ?? false;
+        if (item.provider === LOGIN_PROVIDER.EMAIL) {
+          return emailActionList.includes(action) && (blocklet?.settings?.notification?.email?.enabled ?? false);
         }
 
         if (item.type === 'oauth') {
-          if (!actionList.includes(action)) {
+          if (!oauthActionList.includes(action)) {
             return false;
           }
         }

package/src/Passkey/context.jsx

@@ -12,12 +12,14 @@ import { startAuthentication, startRegistration } from '@simplewebauthn/browser'
 
 import { getApiErrorMessage, getWebAuthnErrorMessage, createAxios, logger } from '../utils';
 import { PassportSwitcher, parseResponse } from '../components/PassportSwitcher';
+import defaultTranslations from '../Connect/assets/locale';
 
 const PasskeyContext = createContext({});
 const { Provider, Consumer: PasskeyConsumer } = PasskeyContext;
 
 const translations = {
   zh: {
+    ...defaultTranslations.zh,
     cancel: '取消',
     usePasskey: '使用 Passkey',
     createPasskey: '新建 Passkey',
@@ -49,6 +51,7 @@ const translations = {
     },
   },
   en: {
+    ...defaultTranslations.en,
     cancel: 'Cancel',
     usePasskey: 'Use Existing Passkey',
     createPasskey: 'Create New Passkey',

package/src/Session/index.jsx

@@ -611,6 +611,16 @@ function createSessionContext(
       fetchAll: true,
     });
 
+    const getMessageByBlocklet = useMemoizedFn((action, locale) => {
+      if (!globalThis.blocklet) return null;
+
+      const messages = globalThis.blocklet?.settings?.actionConfig?.[action];
+      if (messages) {
+        return messages[locale] || messages.en;
+      }
+      return null;
+    });
+
     const ensureLogin = useMemoizedFn(async () => {
       if (!state?.user) {
         await new Promise((resolve) => {
@@ -994,9 +1004,12 @@ function createSessionContext(
       if (pageState?.options?.origin === 'switch-did') {
         localeAction = pageState?.options?.origin;
       }
-      const messages = translations[localeAction];
 
-      const connectMessage = messages[currentLocale] || messages.en;
+      const defaultMessages = translations[localeAction];
+
+      const messages = getMessageByBlocklet(localeAction, currentLocale);
+
+      const connectMessage = messages || defaultMessages[currentLocale] || defaultMessages.en;
       const extraParams = {
         ...opts.extraParams,
         ...props.extraParams,