Merge branch 'main' into e2e-perps-to-smoke

Author: racitores

.github/workflows/build-android-e2e.yml

@@ -35,6 +35,7 @@ jobs:
     runs-on: ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg
     env:
       GRADLE_USER_HOME: /home/admin/_work/.gradle
+      CACHE_GENERATION: v1 # Increment this to bust the cache (v1, v2, v3, etc.)
     outputs:
       apk-uploaded: ${{ steps.upload-apk.outcome == 'success' }}
       aab-uploaded: ${{ steps.upload-aab.outcome == 'success' }}
@@ -63,16 +64,14 @@ jobs:
 
       - name: Cache Gradle dependencies
         uses: cirruslabs/cache@v4
+        id: gradle-cache-restore
+        env:
+          GRADLE_CACHE_VERSION: 1
         with:
           path: |
-            /home/runner/_work/.gradle/caches
-            /home/runner/_work/.gradle/wrapper
-            /home/admin/_work/.gradle/caches
-            /home/admin/_work/.gradle/wrapper
-            android/.gradle
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
+            ~/_work/.gradle/caches
+            ~/_work/.gradle/wrapper
+          key: gradle-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
       - name: Setup project dependencies with retry
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
@@ -115,24 +114,24 @@ jobs:
           fi
 
       - name: Check and restore cached APKs if Fingerprint is found
-        id: cache-restore
+        id: apk-cache-restore
         uses: cirruslabs/cache@v4
         with:
           path: |
             ${{ steps.determine-target-paths.outputs.apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.apk
             ${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
             ${{ steps.determine-target-paths.outputs.aab-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.aab
-          key: android-apk-${{ inputs.build_type }}-${{ steps.generate-fingerprint.outputs.fingerprint }}
+          key: android-apk-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}
           restore-keys: |
-            android-apk-${{ inputs.build_type }}-
+            android-apk-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-
             android-apk-
 
       - name: Build Android E2E APKs
-        if: ${{ steps.cache-restore.outputs.cache-hit != 'true' }}
+        if: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' || steps.gradle-cache-restore.outputs.cache-hit != 'true' }}
         run: |
           echo "🏗 Building Android E2E APKs..."
           export NODE_OPTIONS="--max-old-space-size=8192"
-          # cp android/gradle.properties.github android/gradle.properties - Build for all apps to stabilize e2e 
+          cp android/gradle.properties.github android/gradle.properties
           yarn build:android:${{ inputs.build_type }}:e2e
         shell: bash
         env:
@@ -179,7 +178,7 @@ jobs:
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
 
       - name: Repack APK with JS updates using @expo/repack-app
-        if: ${{ steps.cache-restore.outputs.cache-hit == 'true' }}
+        if: ${{ steps.apk-cache-restore.outputs.cache-hit == 'true' && steps.gradle-cache-restore.outputs.cache-hit == 'true' }}
         run: |
           echo "📦 Repacking APK with updated JavaScript bundle using @expo/repack-app..."
           # Use the optimized repack script which uses @expo/repack-app
@@ -230,14 +229,14 @@ jobs:
 
       # Cache build artifacts with the pre-build fingerprint
       - name: Cache build artifacts
-        if: ${{ steps.cache-restore.outputs.cache-hit != 'true' }}
+        if: ${{ steps.apk-cache-restore.outputs.cache-hit != 'true' || steps.gradle-cache-restore.outputs.cache-hit != 'true' }}
         uses: cirruslabs/cache@v4
         with:
           path: |
             ${{ steps.determine-target-paths.outputs.apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.apk
             ${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
             ${{ steps.determine-target-paths.outputs.aab-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.aab
-          key: android-apk-${{ inputs.build_type }}-${{ steps.generate-fingerprint.outputs.fingerprint }}
+          key: android-apk-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}
 
       - name: Upload Android APK
         id: upload-apk

app/components/UI/Assets/components/Balance/AccountGroupBalance.test.tsx

@@ -9,6 +9,38 @@ jest.mock('../../../../../selectors/assets/balances', () => ({
   selectBalanceBySelectedAccountGroup: jest.fn(() => null),
   // This one is a factory: selectBalanceChangeBySelectedAccountGroup(period) -> (state) => value
   selectBalanceChangeBySelectedAccountGroup: jest.fn(() => () => null),
+  // This selector is used to display the BalanceEmptyState
+  selectAccountGroupBalanceForEmptyState: jest.fn(() => null),
+}));
+
+// Mock homepage redesign feature flag for BalanceEmptyState
+jest.mock('../../../../../selectors/featureFlagController/homepage', () => ({
+  selectHomepageRedesignV1Enabled: jest.fn(() => true),
+}));
+
+// This selector is used to determine if the current network is a testnet for BalanceEmptyState display logic
+jest.mock('../../../../../selectors/networkController', () => ({
+  ...jest.requireActual('../../../../../selectors/networkController'),
+  selectEvmChainId: jest.fn(() => '0x1'), // Ethereum mainnet (not a testnet)
+  selectChainId: jest.fn(() => '0x1'), // BalanceEmptyState also needs this
+}));
+
+// Mock navigation hooks used by BalanceEmptyState
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: () => ({
+    navigate: jest.fn(),
+    goBack: jest.fn(),
+    reset: jest.fn(),
+  }),
+}));
+
+// Mock metrics hook used by BalanceEmptyState
+jest.mock('../../../../../components/hooks/useMetrics', () => ({
+  useMetrics: () => ({
+    trackEvent: jest.fn(),
+    createEventBuilder: jest.fn(() => ({ record: jest.fn() })),
+  }),
 }));
 
 const testState = {
@@ -52,4 +84,36 @@ describe('AccountGroupBalance', () => {
     const el = getByTestId(WalletViewSelectorsIDs.TOTAL_BALANCE_TEXT);
     expect(el).toBeTruthy();
   });
+
+  it('renders empty state when account group balance is zero', () => {
+    const {
+      selectAccountGroupBalanceForEmptyState,
+      selectBalanceBySelectedAccountGroup,
+    } = jest.requireMock('../../../../../selectors/assets/balances');
+
+    // Mock the regular balance selector to return data (prevents skeleton loader)
+    (selectBalanceBySelectedAccountGroup as jest.Mock).mockImplementation(
+      () => ({
+        totalBalanceInUserCurrency: 100, // Some non-zero amount for current network
+        userCurrency: 'usd',
+      }),
+    );
+
+    // Mock the empty state selector to return zero balance across all mainnet networks
+    (selectAccountGroupBalanceForEmptyState as jest.Mock).mockImplementation(
+      () => ({
+        totalBalanceInUserCurrency: 0, // Zero across all mainnet networks
+        userCurrency: 'usd',
+      }),
+    );
+
+    const { getByTestId } = renderWithProvider(<AccountGroupBalance />, {
+      state: testState,
+    });
+
+    const el = getByTestId(
+      WalletViewSelectorsIDs.BALANCE_EMPTY_STATE_CONTAINER,
+    );
+    expect(el).toBeOnTheScreen();
+  });
 });

app/components/UI/Assets/components/Balance/AccountGroupBalance.tsx

@@ -7,7 +7,11 @@ import { selectPrivacyMode } from '../../../../../selectors/preferencesControlle
 import {
   selectBalanceBySelectedAccountGroup,
   selectBalanceChangeBySelectedAccountGroup,
+  selectAccountGroupBalanceForEmptyState,
 } from '../../../../../selectors/assets/balances';
+import { selectHomepageRedesignV1Enabled } from '../../../../../selectors/featureFlagController/homepage';
+import { selectEvmChainId } from '../../../../../selectors/networkController';
+import { TEST_NETWORK_IDS } from '../../../../../constants/network';
 import SensitiveText, {
   SensitiveTextLength,
 } from '../../../../../component-library/components/Texts/SensitiveText';
@@ -16,16 +20,24 @@ import { WalletViewSelectorsIDs } from '../../../../../../e2e/selectors/wallet/W
 import { Skeleton } from '../../../../../component-library/components/Skeleton';
 import { useFormatters } from '../../../../hooks/useFormatters';
 import AccountGroupBalanceChange from '../../components/BalanceChange/AccountGroupBalanceChange';
+import BalanceEmptyState from '../../../BalanceEmptyState';
 
 const AccountGroupBalance = () => {
   const { PreferencesController } = Engine.context;
   const styles = createStyles();
   const { formatCurrency } = useFormatters();
   const privacyMode = useSelector(selectPrivacyMode);
   const groupBalance = useSelector(selectBalanceBySelectedAccountGroup);
+  const accountGroupBalance = useSelector(
+    selectAccountGroupBalanceForEmptyState,
+  );
   const balanceChange1d = useSelector(
     selectBalanceChangeBySelectedAccountGroup('1d'),
   );
+  const isHomepageRedesignV1Enabled = useSelector(
+    selectHomepageRedesignV1Enabled,
+  );
+  const selectedChainId = useSelector(selectEvmChainId);
 
   const togglePrivacy = useCallback(
     (value: boolean) => {
@@ -38,10 +50,30 @@ const AccountGroupBalance = () => {
   const userCurrency = groupBalance?.userCurrency ?? '';
   const displayBalance = formatCurrency(totalBalance, userCurrency);
 
+  // Check if account group balance (across all mainnet networks) is zero for empty state
+  const hasZeroAccountGroupBalance =
+    accountGroupBalance && accountGroupBalance.totalBalanceInUserCurrency === 0;
+
+  // Check if current network is a testnet
+  const isCurrentNetworkTestnet = TEST_NETWORK_IDS.includes(selectedChainId);
+
+  // Show empty state on accounts with an aggregated mainnet balance of zero
+  const shouldShowEmptyState =
+    hasZeroAccountGroupBalance &&
+    isHomepageRedesignV1Enabled &&
+    !isCurrentNetworkTestnet;
+
   return (
     <View style={styles.accountGroupBalance}>
       <View>
-        {groupBalance ? (
+        {!groupBalance ? (
+          <View style={styles.skeletonContainer}>
+            <Skeleton width={100} height={40} />
+            <Skeleton width={100} height={20} />
+          </View>
+        ) : shouldShowEmptyState ? (
+          <BalanceEmptyState testID="account-group-balance-empty-state" />
+        ) : (
           <TouchableOpacity
             onPress={() => togglePrivacy(!privacyMode)}
             testID="balance-container"
@@ -66,11 +98,6 @@ const AccountGroupBalance = () => {
               />
             )}
           </TouchableOpacity>
-        ) : (
-          <View style={styles.skeletonContainer}>
-            <Skeleton width={100} height={40} />
-            <Skeleton width={100} height={20} />
-          </View>
         )}
       </View>
     </View>

app/components/UI/Perps/Views/PerpsCancelAllOrdersView/PerpsCancelAllOrdersView.styles.ts

@@ -0,0 +1,27 @@
+import { StyleSheet } from 'react-native';
+import type { Theme } from '../../../../../util/theme/models';
+
+export const createStyles = (_theme: Theme) =>
+  StyleSheet.create({
+    contentContainer: {
+      paddingHorizontal: 16,
+      paddingVertical: 16,
+    },
+    loadingContainer: {
+      paddingVertical: 32,
+      alignItems: 'center',
+      justifyContent: 'center',
+    },
+    loadingText: {
+      marginTop: 12,
+    },
+    emptyContainer: {
+      paddingVertical: 32,
+      paddingHorizontal: 16,
+      alignItems: 'center',
+      justifyContent: 'center',
+    },
+    footerContainer: {
+      paddingHorizontal: 16,
+    },
+  });