@arcblock/did-connect-react 3.3.1 → 3.3.3

package/src/Connect/components/login-item/web-login-item.jsx

@@ -7,7 +7,7 @@ import noop from 'lodash/noop';
 import omit from 'lodash/omit';
 import { useImperativeHandle } from 'react';
 import ProviderIcon from '@arcblock/ux/lib/DIDConnect/provider-icon';
-import { LOGIN_PROVIDER } from '@arcblock/ux/lib/Util/constant';
+import { LOGIN_PROVIDER, LOGIN_PROVIDER_ICON_SIZE } from '@arcblock/ux/lib/Util/constant';
 
 import LoginMethodItem from './login-method-item';
 import { useStateContext } from '../../contexts/state';
@@ -116,7 +116,7 @@ export default function WebLoginItem({
         currentState.loading || !tokenState.url ? (
           <CircularProgress
             color="primary"
-            size={24}
+            size={LOGIN_PROVIDER_ICON_SIZE}
             sx={{
               '& svg': {
                 transform: 'scale(0.75)',
@@ -125,12 +125,12 @@ export default function WebLoginItem({
           />
         ) : (
           <ProviderIcon
-            width="24px"
-            height="24px"
-            provider={LOGIN_PROVIDER.DID_WALLET}
-            style={{
+            sx={{
+              width: LOGIN_PROVIDER_ICON_SIZE,
+              height: LOGIN_PROVIDER_ICON_SIZE,
               transform: 'scale(0.9)',
             }}
+            provider={LOGIN_PROVIDER.DID_WALLET}
           />
         )
       }

package/src/Connect/index.jsx

@@ -482,9 +482,9 @@ function Connect({
           mode === 'drawer' ? '100%' : hideQRCode || showStatus ? DID_CONNECT_SMALL_WIDTH : DID_CONNECT_MEDIUM_WIDTH,
         transition: 'width 0.2s ease-in-out',
         margin: 'auto',
-        p: isSmallView ? 2 : 3,
+        p: 3,
         pb: 0,
-        gap: 2,
+        gap: 2.5,
       }}>
       <Box data-did-auth-url={state.url} sx={{ display: 'none' }} />
       <DIDConnectTitle

package/src/Connect/plugins/email/list-item.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import { useMemoizedFn } from 'ahooks';
-import mailOutlineRoundedIcon from '@iconify-icons/material-symbols/mail-outline-rounded';
+import mailFilledIcon from '@iconify-icons/tabler/mail-filled';
 import { LOGIN_PROVIDER, LOGIN_PROVIDER_NAME } from '@arcblock/ux/lib/Util/constant';
 import { GA_LAST_LOGIN_METHOD } from '@arcblock/ux/lib/withTracker/constant';
 
@@ -22,7 +22,7 @@ export default function EmailListItem({ ...rest }) {
     <LoginMethodItem
       {...rest}
       title={LOGIN_PROVIDER_NAME[LOGIN_PROVIDER.EMAIL]}
-      icon={mailOutlineRoundedIcon}
+      icon={mailFilledIcon}
       onClick={handleConnect}
     />
   );

package/src/OAuth/context.jsx

@@ -184,7 +184,7 @@ function OAuthProvider({
     try {
       const data = await runPopup({
         popup,
-        closeTimeout: 0,
+        closeTimeout: 1500,
       });
       if (data?.response) {
         return data.response?.code;

package/src/utils.js

@@ -370,9 +370,9 @@ export const runPopup = (config) => {
         clearTimeout(timeoutId);
         clearInterval(popupTimer);
         window.removeEventListener('message', popupEventListener, false);
-
-        resolve(data);
       }, config.closeTimeout || 0);
+      // 不用等弹窗关闭，可以直接返回结果
+      resolve(data);
     };
 
     timeoutId = setTimeout(