From ce1cc9bfffae3132b69acebbcb84b2805d53be2e Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:35 +0100
Subject: [PATCH 1/6] feat: Add activity refresh error banner (#100)

---
 app/(tabs)/history.tsx | 139 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 137 insertions(+), 2 deletions(-)

diff --git a/app/(tabs)/history.tsx b/app/(tabs)/history.tsx
index 052c0da..4b96e0a 100644
--- a/app/(tabs)/history.tsx
+++ b/app/(tabs)/history.tsx
@@ -77,6 +77,75 @@ const ListFooter = ({
   return null;
 };
 
+/**
+ * Non-blocking banner shown when a refresh fails but cached transactions are
+ * still available. Keeps the list visible and offers an inline retry.
+ */
+const RefreshErrorBanner = ({
+  message,
+  onRetry,
+  isRetrying,
+  colors,
+  styles,
+}: {
+  message: string;
+  onRetry: () => void;
+  isRetrying: boolean;
+  colors: ThemeColors;
+  styles: ReturnType<typeof createStyles>;
+}) => (
+  <View style={styles.refreshErrorBanner} testID="refresh-error-banner">
+    <Text style={styles.refreshErrorText}>{message}</Text>
+    <TouchableOpacity
+      style={styles.refreshErrorRetryButton}
+      onPress={onRetry}
+      disabled={isRetrying}
+      accessibilityRole="button"
+    >
+      {isRetrying ? (
+        <ActivityIndicator size="small" color={colors.background} />
+      ) : (
+        <Text style={styles.refreshErrorRetryText}>Retry</Text>
+      )}
+    </TouchableOpacity>
+  </View>
+);
+
+/**
+ * Full-screen error shown when a refresh fails and there is no cached activity
+ * to display.
+ */
+const ActivityErrorState = ({
+  onRetry,
+  isRetrying,
+  colors,
+  styles,
+}: {
+  onRetry: () => void;
+  isRetrying: boolean;
+  colors: ThemeColors;
+  styles: ReturnType<typeof createStyles>;
+}) => (
+  <View style={styles.fullScreenError} testID="activity-error-state">
+    <Text style={styles.fullScreenErrorTitle}>Couldn't load activity</Text>
+    <Text style={styles.fullScreenErrorMessage}>
+      We couldn't refresh your activity right now. Please try again.
+    </Text>
+    <TouchableOpacity
+      style={styles.fullScreenErrorRetryButton}
+      onPress={onRetry}
+      disabled={isRetrying}
+      accessibilityRole="button"
+    >
+      {isRetrying ? (
+        <ActivityIndicator size="small" color={colors.background} />
+      ) : (
+        <Text style={styles.fullScreenErrorRetryText}>Retry</Text>
+      )}
+    </TouchableOpacity>
+  </View>
+);
+
 /**
  * Shown when there are no transactions and the screen is not loading.
  */
@@ -248,6 +317,15 @@ export default function HistoryScreen() {
               onRetry={() => { refreshWalletData(); retry(); }}
               isRetrying={isLoading}
             />
+            {error && transactions.length > 0 && (
+              <RefreshErrorBanner
+                message="Couldn't refresh activity. Showing cached transactions."
+                onRetry={() => { refreshWalletData(); retry(); }}
+                isRetrying={isLoading}
+                colors={colors}
+                styles={styles}
+              />
+            )}
             <View style={styles.filterContainer}>
               <ScrollView 
                 horizontal 
@@ -278,7 +356,14 @@ export default function HistoryScreen() {
         }
         ListFooterComponent={renderFooter}
         ListEmptyComponent={
-          !isLoading ? (
+          error && transactions.length === 0 ? (
+            <ActivityErrorState
+              onRetry={() => { refreshWalletData(); retry(); }}
+              isRetrying={isLoading}
+              colors={colors}
+              styles={styles}
+            />
+          ) : !isLoading ? (
             <ActivityEmptyState
               colors={colors}
               styles={styles}
@@ -287,7 +372,14 @@ export default function HistoryScreen() {
           ) : null
         }
         // Avoid stale closures while also keeping rendering performant.
-        extraData={{ isLoadingMore, hasMoreTransactions, colors, styles }}
+        extraData={{
+          isLoadingMore,
+          hasMoreTransactions,
+          colors,
+          styles,
+          error,
+          hasTransactions: transactions.length > 0,
+        }}
       />
     </View>
   );
@@ -332,6 +424,49 @@ const createStyles = (colors: ThemeColors) => StyleSheet.create({
     color: colors.textMuted,
     fontSize: 13,
   },
+  refreshErrorBanner: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    backgroundColor: colors.surface,
+    borderLeftWidth: 3,
+    borderLeftColor: colors.error,
+    borderRadius: RADIUS.md,
+    paddingHorizontal: SIZES.md,
+    paddingVertical: SIZES.sm,
+    marginBottom: SIZES.md,
+  },
+  refreshErrorText: {
+    flex: 1,
+    color: colors.textSecondary,
+    fontSize: 14,
+    marginRight: SIZES.sm,
+  },
+  refreshErrorRetryButton: {
+    backgroundColor: colors.error,
+    borderRadius: RADIUS.md,
+    paddingHorizontal: SIZES.md,
+    paddingVertical: SIZES.xs,
+    minWidth: 64,
+    alignItems: 'center',
+  },
+  refreshErrorRetryText: {
+    color: colors.background,
+    fontSize: 14,
+    fontWeight: '600',
+  },
+  fullScreenError: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: SIZES.xl,
+  },
+  fullScreenErrorTitle: {
+    color: colors.textSecondary,
+    fontSize: 18,
+    fontWeight: '600',
+    marginBottom: SIZES.sm,
+
   sectionHeader: {
     paddingTop: SIZES.sm,
     paddingBottom: SIZES.xs,

From 98ea66a58657d9a9079b71db4cf6c603440fef7d Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:37 +0100
Subject: [PATCH 2/6] feat: Add activity refresh error banner (#100)

---
 src/store/walletStore.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/store/walletStore.ts b/src/store/walletStore.ts
index 6ee485a..f71f227 100644
--- a/src/store/walletStore.ts
+++ b/src/store/walletStore.ts
@@ -40,6 +40,7 @@ interface WalletState {
   isFunding: boolean;
   fundError: string | null;
   error: string | null;
+  refreshError: string | null;
   showBackupReminder: boolean;
   /** True once the initial `loadWalletFromStorage` call has resolved (success or failure). */
   walletChecked: boolean;
@@ -92,6 +93,7 @@ const resetWalletState = () => ({
   nextCursor: null,
   balanceState: 'idle' as BalanceState,
   fundingStatus: 'unknown' as FundingStatus,
+  refreshError: null,
 });
 
 const parseStoredSecret = (storedValue: string): string | null => {
@@ -137,6 +139,7 @@ export const useWalletStore = create<WalletState>((set, get) => ({
   isFunding: false,
   fundError: null,
   error: null,
+  refreshError: null,
   balanceState: 'idle' as BalanceState,
   fundingStatus: 'unknown' as FundingStatus,
   isLoadingMore: false,
@@ -223,7 +226,7 @@ export const useWalletStore = create<WalletState>((set, get) => ({
     const { publicKey } = get();
     if (!publicKey) return;
 
-    set({ isLoading: true, error: null, balanceState: 'loading', isLoadingMore: false, nextCursor: null, hasMoreTransactions: false });
+    set({ isLoading: true, error: null, refreshError: null, balanceState: 'loading', isLoadingMore: false, nextCursor: null, hasMoreTransactions: false });
     try {
       const [balance, page] = await Promise.all([
         fetchXlmBalance(publicKey),
@@ -258,10 +261,12 @@ export const useWalletStore = create<WalletState>((set, get) => ({
       });
     } catch (err: any) {
       console.error('Failed to refresh wallet data');
+      const hasExistingData = get().transactions.length > 0;
       set({
         isLoading: false,
-        balanceState: 'unavailable',
-        error: err.message || 'Failed to sync data',
+        balanceState: hasExistingData ? 'available' : 'unavailable',
+        error: hasExistingData ? null : (err.message || 'Failed to sync data'),
+        refreshError: hasExistingData ? (err.message || 'Failed to sync data') : null,
       });
     }
   },

From 296613e84cd23e2e2e533fa3311b740f48c2da77 Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:39 +0100
Subject: [PATCH 3/6] feat: Add activity refresh error banner (#100)

---
 src/components/ErrorState.tsx | 43 ++++++++++++-----------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/components/ErrorState.tsx b/src/components/ErrorState.tsx
index 4784181..72dd4da 100644
--- a/src/components/ErrorState.tsx
+++ b/src/components/ErrorState.tsx
@@ -18,6 +18,7 @@ export interface ErrorStateProps {
   action?: ErrorStateAction;
   style?: StyleProp<ViewStyle>;
   testID?: string;
+  variant?: 'fullscreen' | 'banner';
 }
 
 export const ErrorState: React.FC<ErrorStateProps> = ({
@@ -27,9 +28,10 @@ export const ErrorState: React.FC<ErrorStateProps> = ({
   action,
   style,
   testID = 'error-state',
+  variant = 'fullscreen',
 }) => {
   const { colors } = useTheme();
-  const styles = useMemo(() => createStyles(colors), [colors]);
+  const styles = useMemo(() => createStyles(colors, variant), [colors, variant]);
 
   return (
     <View
@@ -39,10 +41,12 @@ export const ErrorState: React.FC<ErrorStateProps> = ({
       testID={testID}
     >
       <View style={styles.iconWrapper}>
-        {icon ?? <AlertTriangle color={colors.error} size={48} />}
+        {icon ?? <AlertTriangle color={colors.error} size={variant === 'banner' ? 20 : 48} />}
+      </View>
+      <View style={styles.contentWrapper}>
+        <Text style={styles.title}>{title}</Text>
+        {message ? <Text style={styles.message}>{message}</Text> : null}
       </View>
-      <Text style={styles.title}>{title}</Text>
-      {message ? <Text style={styles.message}>{message}</Text> : null}
       {action ? (
         <Button
           title={action.label}
@@ -55,31 +59,14 @@ export const ErrorState: React.FC<ErrorStateProps> = ({
   );
 };
 
-const createStyles = (colors: ThemeColors) =>
+const createStyles = (colors: ThemeColors, variant: 'fullscreen' | 'banner') =>
   StyleSheet.create({
     container: {
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: SIZES.xl,
-    },
-    iconWrapper: {
-      marginBottom: SIZES.md,
-    },
-    title: {
-      color: colors.textPrimary,
-      fontSize: 18,
-      fontWeight: 'bold',
-      textAlign: 'center',
-      marginBottom: SIZES.xs,
-    },
-    message: {
-      color: colors.textSecondary,
-      fontSize: 14,
-      textAlign: 'center',
-      lineHeight: 20,
-    },
-    action: {
-      marginTop: SIZES.lg,
-      minWidth: 140,
+      ...(variant === 'fullscreen' ? { alignItems: 'center', justifyContent: 'center', padding: SIZES.xl } : { flexDirection: 'row', alignItems: 'center', padding: SIZES.md, borderWidth: 1, borderColor: colors.error, borderRadius: SIZES.sm, backgroundColor: colors.background }),
     },
+    contentWrapper: { flex: 1, marginRight: SIZES.sm },
+    iconWrapper: { ...(variant === 'fullscreen' ? { marginBottom: SIZES.md } : { marginRight: SIZES.sm }), },
+    title: { color: colors.textPrimary, fontSize: variant === 'banner' ? 14 : 18, fontWeight: 'bold', textAlign: variant === 'banner' ? 'left' : 'center', marginBottom: SIZES.xs },
+    message: { color: colors.textSecondary, fontSize: variant === 'banner' ? 12 : 14, textAlign: variant === 'banner' ? 'left' : 'center', lineHeight: variant === 'banner' ? 16 : 20 },
+    action: { ...(variant === 'fullscreen' ? { marginTop: SIZES.lg, minWidth: 140 } : { marginLeft: SIZES.sm, minWidth: 80 }), },
   });

From e9bc6fc5a7088daa7f36a0ea613eece89935a701 Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:40 +0100
Subject: [PATCH 4/6] feat: Add activity refresh error banner (#100)

---
 src/features/transactions/types.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/features/transactions/types.ts b/src/features/transactions/types.ts
index 467e0d8..d169869 100644
--- a/src/features/transactions/types.ts
+++ b/src/features/transactions/types.ts
@@ -1,6 +1,6 @@
 /**
  * Transaction feature types and interfaces
- */
+*/
 
 export interface TransactionDetail {
   id: string;
@@ -40,3 +40,12 @@ export interface TransactionMetadata {
   status: TransactionStatus;
   counterparty: string | null;
 }
+
+// Activity state types for refresh error handling
+export interface ActivityState {
+  transactions: TransactionDetail[];
+  isLoading: boolean;
+  isRefreshing: boolean;
+  fullScreenError: string | null;
+  refreshError: string | null;
+}
\ No newline at end of file

From 632630890dbb1aec44e6f569b94aaf4023ffa5e0 Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:42 +0100
Subject: [PATCH 5/6] feat: Add activity refresh error banner (#100)

---
 src/features/transactions/helpers.ts | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/features/transactions/helpers.ts b/src/features/transactions/helpers.ts
index 67a53fa..06c573f 100644
--- a/src/features/transactions/helpers.ts
+++ b/src/features/transactions/helpers.ts
@@ -51,7 +51,7 @@ export function formatTransactionAmount(
   const prefix = isSent ? '-' : '+';
   const asset = tx.asset || 'XLM';
   
-  return `${prefix}${amount} ${asset}`;
+  return `${prefix}${amount} {asset}`;
 }
 
 /**
@@ -87,7 +87,7 @@ export function getTransactionMemo(tx: TransactionDetail): {
   
   return {
     text: tx.memo,
-    type: tx.memo_type || '',
+    type: tx.memo_type || ''
   };
 }
 
@@ -119,3 +119,27 @@ export function getDirectionLabel(
   const isSent = isSentTransaction(tx, currentPublicKey);
   return isSent ? 'Sent' : 'Received';
 }
+
+/**
+ * Error states for transaction activity refresh
+ */
+export type RefreshErrorState = 'none' | 'banner' | 'fullscreen';
+
+/**
+ * Determines how a refresh error should be presented.
+ * If there's existing transaction data, show a non-blocking banner.
+ * Otherwise, show a full-screen error.
+ */
+export function getRefreshErrorState(
+  hasExistingData: boolean,
+  hasError: boolean
+): RefreshErrorState {
+  if (!hasError) return 'none';
+  return hasExistingData ? 'banner' : 'fullscreen';
+}
+
+/**
+ * Non-sensitive error message for activity refresh failures.
+ */
+export const REFRESH_ERROR_MESSAGE =
+  'Unable to refresh activity. Please check your connection and try again.';

From aa9583734f9fbc8eb7518a1e81b70d472c13b70e Mon Sep 17 00:00:00 2001
From: Binali223 <156178015+Binali223@users.noreply.github.com>
Date: Thu, 27 Aug 2026 16:47:43 +0100
Subject: [PATCH 6/6] feat: Add activity refresh error banner (#100)

---
 src/components/NetworkStateBanner.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/NetworkStateBanner.tsx b/src/components/NetworkStateBanner.tsx
index e0d91e1..4725935 100644
--- a/src/components/NetworkStateBanner.tsx
+++ b/src/components/NetworkStateBanner.tsx
@@ -9,18 +9,22 @@ interface NetworkStateBannerProps {
   onRetry?: () => void;
   /** True while a re-check or refresh is in flight. */
   isRetrying?: boolean;
+  /** True when there is existing activity data to display. */
+  hasData?: boolean;
 }
 
 export const NetworkStateBanner: React.FC<NetworkStateBannerProps> = ({
   state,
   onRetry,
   isRetrying = false,
+  hasData = false,
 }: NetworkStateBannerProps) => {
   return (
     <NetworkStatusBanner
       state={state}
       onRetry={onRetry}
       isRetrying={isRetrying}
+      variant={hasData ? 'banner' : 'fullscreen' }
       testID="network-state-banner"
       retryTestID="network-state-retry"
     />