From c9cd25d18f00964bf7bb551c6df57829980cb745 Mon Sep 17 00:00:00 2001
From: lilyzhaun <90462695+lilyzhaun@users.noreply.github.com>
Date: Fri, 12 Jun 2026 02:51:01 +0800
Subject: [PATCH] fix(ui): keep a close control in empty mobile changes states
 (#1525)

The newer mobile Changes surface returns early for non-interactive list states (no directory selected, repository status still loading, or current directory is not a Git repository). Those branches rendered only MobileChangesState and skipped the standard header row entirely.

On Android PWA this leaves the sheet with no visible close/back affordance. Because the surface is hosted inside MobileSurfaceShell as a modal sheet, the browser/system back gesture does not reliably dismiss it, so users were forced to tap sparse overlay whitespace to escape.

Fix the regression by wrapping those early-return states in the same top header used by the normal Changes list, including the close button and current path label. This keeps dismissal available even when the new mobile UI is showing an empty/error state. While touching the file, switch the remaining direct @remixicon/react usages in this component to the shared Icon system to match current UI conventions.

Validated with packages/ui type-check and a packages/web build.

Co-authored-by: lilyzhaun <lilyzhaun@users.noreply.github.com>
---
 packages/ui/src/apps/MobileChangesSurface.tsx | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/apps/MobileChangesSurface.tsx b/packages/ui/src/apps/MobileChangesSurface.tsx
index 01fa8cba..6818fec3 100644
--- a/packages/ui/src/apps/MobileChangesSurface.tsx
+++ b/packages/ui/src/apps/MobileChangesSurface.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { RiArrowLeftLine, RiCloseLine, RiGitBranchLine, RiLoader4Line } from '@remixicon/react';
+import { Icon } from '@/components/icon/Icon';
 
 import { toast } from '@/components/ui';
 import { Button } from '@/components/ui/button';
@@ -443,16 +443,41 @@ export const MobileChangesSurface: React.FC<MobileChangesSurfaceProps> = ({ onCl
     return groups;
   }, [handleRevertFile, handleViewChangeDiff, moveChangePaths, stagedChangeEntries, t, unstagedChangeEntries]);
 
+  const renderListState = (state: React.ReactNode) => (
+    <div className="flex h-full flex-col overflow-hidden bg-background text-foreground">
+      <header className="flex h-[var(--oc-header-height,56px)] shrink-0 items-center gap-2 px-3 text-foreground">
+        {onClose ? (
+          <button
+            type="button"
+            className="-ml-1 flex size-10 shrink-0 items-center justify-center rounded-full text-muted-foreground transition-colors hover:bg-interactive-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+            aria-label={t('mobile.surface.closeAria')}
+            onClick={onClose}
+            style={{ touchAction: 'manipulation' }}
+          >
+            <Icon name="close" className="size-5" />
+          </button>
+        ) : null}
+        <div className="min-w-0 flex-1 px-1">
+          <h2 className="typography-ui-label text-foreground">{t('mobile.nav.changes')}</h2>
+          <p className="truncate typography-micro text-muted-foreground">
+            {status?.current || currentDirectory || ''}
+          </p>
+        </div>
+      </header>
+      <div className="min-h-0 flex-1">{state}</div>
+    </div>
+  );
+
   if (!currentDirectory) {
-    return <MobileChangesState message={t('gitView.empty.selectSessionOrDirectory')} />;
+    return renderListState(<MobileChangesState message={t('gitView.empty.selectSessionOrDirectory')} />);
   }
 
   if (isLoadingStatus && isGitRepo === null) {
-    return <MobileChangesState loading message={t('gitView.loading.checkingRepository')} />;
+    return renderListState(<MobileChangesState loading message={t('gitView.loading.checkingRepository')} />);
   }
 
   if (isGitRepo === false) {
-    return <MobileChangesState icon message={t('gitView.empty.notGitRepository')} description={t('gitView.empty.notGitRepositoryDescription')} />;
+    return renderListState(<MobileChangesState icon message={t('gitView.empty.notGitRepository')} description={t('gitView.empty.notGitRepositoryDescription')} />);
   }
 
   if (route.type === 'diff') {
@@ -479,7 +504,7 @@ export const MobileChangesSurface: React.FC<MobileChangesSurfaceProps> = ({ onCl
             onClick={onClose}
             style={{ touchAction: 'manipulation' }}
           >
-            <RiCloseLine className="size-5" />
+            <Icon name="close" className="size-5" />
           </button>
         ) : null}
         <div className="min-w-0 flex-1 px-1">
@@ -548,8 +573,8 @@ const MobileChangesState: React.FC<{
 }> = ({ message, description, loading = false, icon = false }) => (
   <div className="flex h-full items-center justify-center px-6 text-center">
     <div className="flex max-w-sm flex-col items-center gap-2">
-      {loading ? <RiLoader4Line className="size-5 animate-spin text-muted-foreground" /> : null}
-      {icon ? <RiGitBranchLine className="size-6 text-muted-foreground" /> : null}
+      {loading ? <Icon name="loader-4" className="size-5 animate-spin text-muted-foreground" /> : null}
+      {icon ? <Icon name="git-branch" className="size-6 text-muted-foreground" /> : null}
       <p className="typography-ui-label font-semibold text-foreground">{message}</p>
       {description ? <p className="typography-meta text-muted-foreground">{description}</p> : null}
     </div>
@@ -576,7 +601,7 @@ const MobileDiffDetail: React.FC<{
           aria-label={t('header.actions.backAria')}
           onClick={onBack}
         >
-          <RiArrowLeftLine className="size-5" />
+          <Icon name="arrow-left" className="size-5" />
         </button>
         <div className="min-w-0 flex-1 px-2">
           <h2 className="truncate typography-ui-header text-foreground">{path}</h2>