Merge remote-tracking branch 'origin/issue-1857' into upgrade-ui

.github/workflows/build-internal.yml

@@ -47,14 +47,12 @@ jobs:
 
     - name: Use Node.js 18
       uses: actions/setup-node@v4
-      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         node-version: 18
         cache: 'yarn'
 
     - name: Cache Yarn dependencies
       uses: actions/cache@v3
-      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       id: yarn-cache # optional, but allows referencing the step
       with:
         path: |
@@ -69,7 +67,6 @@ jobs:
 
     - name: Restore Pods Cache
       uses: actions/cache@v3
-      if: ${{ runner.name != 'Dos-Mac-mini' && runner.name != 'Mac-x86' }}
       with:
         path: |
           ios/Pods
@@ -87,14 +84,14 @@ jobs:
 
     # Build IPA file
     - name: iOS Build Action
-      uses: yukiarrr/ios-build-action@v1.12.0
+      uses: yukiarrr/ios-build-action@v1.11.2
       with:
-        project-path: ./ios/SubWalletMobile.xcodeproj
+        project-path: SubWalletMobile.xcodeproj
         p12-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
         mobileprovision-base64: ${{ secrets.BUILD_ADHOC_PROVISION_PROFILE_BASE64 }}
         code-signing-identity: 'Apple Distribution: CDM SOFTWARE DEVELOPMENT COMPANY LIMITED (ZUZ7T3GQMT)'
         team-id: ${{ secrets.APPLE_TEAM_ID }}
-        workspace-path: ./ios/SubWalletMobile.xcworkspace
+        workspace-path: SubWalletMobile.xcworkspace
         export-method: 'ad-hoc'
         configuration: Debug
         certificate-password: ${{ secrets.P12_PASSWORD }}

src/screens/Settings/Security/DAppAccess/DAppAccessDetailScreen.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { StyleSheet, Switch, View } from 'react-native';
 import { FlatListScreen } from 'components/FlatListScreen';
-import { DotsThree, Plugs, PlugsConnected, Shield, ShieldSlash, Users, X } from 'phosphor-react-native';
+import { DotsThree, Plugs, PlugsConnected, Shield, ShieldSlash, Users, X, Plug } from 'phosphor-react-native';
 import { MoreOptionItemType, MoreOptionModal } from 'screens/Settings/Security/DAppAccess/MoreOptionModal';
 import { useSelector } from 'react-redux';
 import { RootState } from 'stores/index';
@@ -23,13 +23,30 @@ import { ListRenderItemInfo } from '@shopify/flash-list';
 import { AuthUrlInfo } from '@subwallet/extension-base/services/request-service/types';
 import { AccountChainType, AccountProxy } from '@subwallet/extension-base/types';
 import { AccountAuthType } from '@subwallet/extension-base/background/types';
+import { getAccountCount } from 'screens/Settings/Security/DAppAccess/index';
 
 type Props = {
   origin: string;
   accountAuthTypes: AccountAuthType[];
   authInfo: AuthUrlInfo;
 };
 
+enum ConnectionStatement {
+  NOT_CONNECTED = 'not-connected',
+  CONNECTED = 'connected',
+  PARTIAL_CONNECTED = 'partial-connected',
+  DISCONNECTED = 'disconnected',
+  BLOCKED = 'blocked',
+}
+
+const iconMap = {
+  [ConnectionStatement.NOT_CONNECTED]: Plug,
+  [ConnectionStatement.CONNECTED]: PlugsConnected,
+  [ConnectionStatement.PARTIAL_CONNECTED]: PlugsConnected,
+  [ConnectionStatement.DISCONNECTED]: Plugs,
+  [ConnectionStatement.BLOCKED]: Plugs,
+};
+
 const searchFunction = (items: AccountProxy[], searchString: string) => {
   return items.filter(
     item =>
@@ -68,15 +85,48 @@ const Content = ({ origin, accountAuthTypes, authInfo }: Props) => {
     );
   }, [accountAuthTypes, accountProxies]);
   const styles = createStyle(theme);
-  const accountConnectedItems = useMemo(() => {
-    return accountProxyItems.filter(acc => authInfo.isAllowedMap[acc.id]);
-  }, [accountProxyItems, authInfo.isAllowedMap]);
+  const accountConnectedItemLength = useMemo(
+    () => getAccountCount(authInfo, accountProxies),
+    [accountProxies, authInfo],
+  );
+
+  const dAppStatus = useMemo(() => {
+    if (authInfo) {
+      if (!authInfo.isAllowed) {
+        return ConnectionStatement.BLOCKED;
+      } else {
+        if (accountConnectedItemLength === 0) {
+          return ConnectionStatement.DISCONNECTED;
+        } else {
+          if (accountConnectedItemLength > 0 && accountConnectedItemLength < accountProxyItems.length) {
+            return ConnectionStatement.PARTIAL_CONNECTED;
+          } else {
+            return ConnectionStatement.CONNECTED;
+          }
+        }
+      }
+    } else {
+      return ConnectionStatement.NOT_CONNECTED;
+    }
+  }, [accountConnectedItemLength, accountProxyItems.length, authInfo]);
+
+  const iconBackgroundColorMap = useMemo(
+    () => ({
+      [ConnectionStatement.DISCONNECTED]: theme['gray-3'],
+      [ConnectionStatement.BLOCKED]: theme.colorError,
+      [ConnectionStatement.NOT_CONNECTED]: theme['gray-3'],
+      [ConnectionStatement.PARTIAL_CONNECTED]: theme.colorWarning,
+      [ConnectionStatement.CONNECTED]: theme['green-6'],
+    }),
+    [theme],
+  );
 
   const renderBeforeListItem = () => (
     <>
       <DappAccessItem
         containerStyle={{ marginVertical: 16 }}
         item={authInfo}
+        accountCount={accountConnectedItemLength}
         middleItem={
           <View style={{ flexDirection: 'row', alignItems: 'stretch', flex: 1, justifyContent: 'space-between' }}>
             <Typography.Text ellipsis style={styles.dAppAccessDetailName}>
@@ -90,15 +140,15 @@ const Content = ({ origin, accountAuthTypes, authInfo }: Props) => {
         rightItem={
           <BackgroundIcon
             shape={'circle'}
-            backgroundColor={authInfo.isAllowed ? theme['green-6'] : theme.colorError}
-            phosphorIcon={authInfo.isAllowed ? PlugsConnected : ShieldSlash}
+            backgroundColor={iconBackgroundColorMap[dAppStatus]}
+            phosphorIcon={iconMap[dAppStatus]}
             weight={'fill'}
           />
         }
       />
       <Typography.Text style={{ paddingLeft: theme.padding, paddingBottom: 4 }}>
         <Typography.Text style={styles.dAppAccessDetailConnectedAcc}>
-          {`${('0' + accountConnectedItems.length).slice(-2)}`}
+          {`${('0' + accountConnectedItemLength).slice(-2)}`}
         </Typography.Text>
         <Typography.Text style={styles.dAppAccessDetailAllAcc}>
           {`/${('0' + accountProxyItems.length).slice(-2)} ${i18n.common.accountConnected}`}
@@ -284,8 +334,13 @@ export const DAppAccessDetailScreen = ({
   },
 }: DAppAccessDetailProps) => {
   const authInfo: undefined | AuthUrlInfo = useSelector((state: RootState) => state.settings.authUrls[origin]);
+  const [_authInfo, setAuthInfo] = useState<undefined | AuthUrlInfo>(undefined);
+
+  useEffect(() => {
+    setAuthInfo(authInfo);
+  }, [authInfo]);
 
-  return <>{!!authInfo && <Content accountAuthTypes={accountAuthTypes} origin={origin} authInfo={authInfo} />}</>;
+  return <>{!!_authInfo && <Content accountAuthTypes={accountAuthTypes} origin={origin} authInfo={_authInfo} />}</>;
 };
 
 function createStyle(theme: ThemeTypes) {

src/screens/Settings/Security/DAppAccess/index.tsx

@@ -26,7 +26,7 @@ function getDAppItems(authUrlMap: Record<string, AuthUrlInfo>): AuthUrlInfo[] {
   return Object.values(authUrlMap);
 }
 
-function getAccountCount(item: AuthUrlInfo, accountProxies: AccountProxy[]): number {
+export function getAccountCount(item: AuthUrlInfo, accountProxies: AccountProxy[]): number {
   const authTypes = item.accountAuthTypes;
 
   return accountProxies.filter(ap => {