Add infinite scroll and pull to refresh

mobile-app/analysis_options.yaml

@@ -21,6 +21,7 @@ analyzer:
     - "**/*.g.dart"
     - "**/*.freezed.dart"
     - "lib/generated/**"
+    - "build/**"
   errors:
     avoid_print: ignore # print is the most reliable way to debug the app
     missing_required_param: error

mobile-app/lib/models/pagination_state.dart

@@ -8,32 +8,49 @@ class PaginationState {
   final int otherOffset;
   final bool hasMore;
   final bool isFetching;
+  final bool isLoading;
   final Object? error;
   final StackTrace? stackTrace;
 
+  bool get hasLoadedChainData => otherTransfers.isNotEmpty || scheduledReversibleTransfers.isNotEmpty;
+
   PaginationState({
     required this.otherTransfers,
     required this.scheduledReversibleTransfers,
     this.scheduledOffset = 0,
     this.otherOffset = 0,
     required this.hasMore,
     required this.isFetching,
+    required this.isLoading,
     this.error,
     this.stackTrace,
   });
 
-  factory PaginationState.initial() =>
-      PaginationState(otherTransfers: [], scheduledReversibleTransfers: [], hasMore: true, isFetching: false);
+  factory PaginationState.initial() => PaginationState(
+    otherTransfers: [],
+    scheduledReversibleTransfers: [],
+    hasMore: true,
+    isFetching: false,
+    isLoading: true,
+  );
 
+  /// Returns a copy with the given fields replaced.
+  ///
+  /// For [error] and [stackTrace]: omitted arguments keep the current values.
+  /// Pass [error] and/or [stackTrace] to set them. Pass [clearError] true to
+  /// set both to null; [clearError] takes precedence over [error] and
+  /// [stackTrace] when all are provided.
   PaginationState copyWith({
     List<TransactionEvent>? otherTransfers,
     List<ReversibleTransferEvent>? scheduledReversibleTransfers,
     int? scheduledOffset,
     int? otherOffset,
     bool? hasMore,
     bool? isFetching,
+    bool? isLoading,
     Object? error,
     StackTrace? stackTrace,
+    bool clearError = false,
   }) {
     return PaginationState(
       otherTransfers: otherTransfers ?? this.otherTransfers,
@@ -42,8 +59,9 @@ class PaginationState {
       otherOffset: otherOffset ?? this.otherOffset,
       hasMore: hasMore ?? this.hasMore,
       isFetching: isFetching ?? this.isFetching,
-      error: error ?? this.error,
-      stackTrace: stackTrace ?? this.stackTrace,
+      isLoading: isLoading ?? this.isLoading,
+      error: clearError ? null : (error ?? this.error),
+      stackTrace: clearError ? null : (stackTrace ?? this.stackTrace),
     );
   }
 }

mobile-app/lib/providers/active_account_transactions_provider.dart

@@ -2,10 +2,41 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/models/combined_transactions_list.dart';
 import 'package:resonance_network_wallet/models/filtered_transactions_params.dart';
+import 'package:resonance_network_wallet/models/pagination_state.dart';
 import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/controllers/unified_pagination_controller.dart';
 import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 
+FilteredTransactionsParams? activeAccountFilteredParams(DisplayAccount? activeAccount, TransactionFilter filter) {
+  if (activeAccount == null) return null;
+  return FilteredTransactionsParams(
+    accountIds: AccountIdListCache.get([activeAccount.account.accountId]),
+    filter: filter,
+  );
+}
+
+UnifiedPaginationController? readActiveAccountPaginationNotifier(WidgetRef ref, TransactionFilter filter) {
+  final params = activeAccountFilteredParams(ref.read(activeAccountProvider).value, filter);
+  if (params == null) return null;
+  return ref.read(filteredPaginationControllerProviderFamily(params).notifier);
+}
+
+/// Pagination state for the active account and [TransactionFilter].
+final activeAccountPaginationProvider = Provider.family<PaginationState?, TransactionFilter>((ref, filter) {
+  final activeAccountValue = ref.watch(activeAccountProvider);
+
+  return activeAccountValue.when(
+    data: (activeAccount) {
+      final params = activeAccountFilteredParams(activeAccount, filter);
+      if (params == null) return null;
+      return ref.watch(filteredPaginationControllerProviderFamily(params));
+    },
+    loading: () => null,
+    error: (_, _) => null,
+  );
+});
+
 /// Provides a filtered list of transactions for the currently active account.
 ///
 /// Parameterised by [TransactionFilter] so callers can independently watch
@@ -21,10 +52,7 @@ final activeAccountTransactionsProvider = Provider.family<AsyncValue<CombinedTra
       if (activeAccount == null) {
         return AsyncValue.data(CombinedTransactionsList.empty);
       }
-      final params = FilteredTransactionsParams(
-        accountIds: AccountIdListCache.get([activeAccount.account.accountId]),
-        filter: filter,
-      );
+      final params = activeAccountFilteredParams(activeAccount, filter)!;
       return ref.watch(filteredTransactionsProviderFamily(params));
     },
     loading: () => const AsyncValue.loading(),

mobile-app/lib/providers/all_transactions_provider.dart

@@ -5,6 +5,7 @@ import 'package:resonance_network_wallet/models/pagination_state.dart';
 import 'package:resonance_network_wallet/providers/controllers/unified_pagination_controller.dart';
 import 'package:resonance_network_wallet/providers/pending_cancellations_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_transactions_provider.dart';
+import 'package:resonance_network_wallet/shared/utils/print.dart';
 
 final paginationControllerProvider = StateNotifierProvider<UnifiedPaginationController, PaginationState>(
   (ref) => UnifiedPaginationController(ref),
@@ -16,10 +17,14 @@ final allTransactionsProvider = Provider<AsyncValue<CombinedTransactionsList>>((
   final pending = ref.watch(pendingTransactionsProvider);
   final pagination = ref.watch(paginationControllerProvider);
 
-  if (pagination.error != null) {
+  if (pagination.error != null && !pagination.hasLoadedChainData) {
+    quantusDebugPrint('AllTransactionsProvider: Error: ${pagination.error}');
     return AsyncValue.error(pagination.error!, pagination.stackTrace!);
   }
-  if (pagination.isFetching && pagination.otherTransfers.isEmpty) {
+  if (pagination.error != null) {
+    quantusDebugPrint('AllTransactionsProvider: Load-more error: ${pagination.error}');
+  }
+  if (pagination.isLoading && !pagination.hasLoadedChainData) {
     return const AsyncValue.loading();
   }
 

mobile-app/lib/providers/controllers/unified_pagination_controller.dart

@@ -6,6 +6,7 @@ import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/providers/connectivity_provider.dart';
+import 'package:resonance_network_wallet/shared/utils/print.dart';
 
 /// Unified pagination controller that handles both all-accounts and
 /// filtered-accounts scenarios
@@ -42,13 +43,13 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
     try {
       ids = await _getAccountIdsAsync();
     } catch (e, st) {
-      print('Initialization failed: $e\n$st');
-      state = state.copyWith(error: e, stackTrace: st);
+      quantusDebugPrint('Initialization failed: $e\n$st');
+      state = state.copyWith(error: e, stackTrace: st, isLoading: false);
       return;
     }
 
     if (ids.isEmpty) {
-      state = state.copyWith(hasMore: false, isFetching: false);
+      state = state.copyWith(hasMore: false, isFetching: false, isLoading: false);
       return;
     }
 
@@ -77,7 +78,7 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
 
   Future<void> _fetchPage(List<String> targetAccountIds) async {
     try {
-      state = state.copyWith(isFetching: true);
+      state = state.copyWith(isFetching: true, isLoading: true, clearError: true);
       final newTransactions = await ref
           .read(chainHistoryServiceProvider)
           .fetchAllTransactionTypes(
@@ -98,17 +99,17 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
         scheduledOffset: newTransactions.nextScheduledOffset,
         hasMore: newTransactions.hasMore,
         isFetching: false,
-        error: null,
-        stackTrace: null,
+        isLoading: false,
+        clearError: true,
       );
     } catch (e, st) {
-      print('Fetch page failed: $e\n$st');
-      state = state.copyWith(error: e, stackTrace: st, isFetching: false);
+      quantusDebugPrint('Fetch page failed: $e\n$st');
+      state = state.copyWith(error: e, stackTrace: st, isFetching: false, isLoading: false);
     }
   }
 
   Future<void> fetchMore() async {
-    print('UnifiedPaginationController: Fetch more');
+    quantusDebugPrint('UnifiedPaginationController: Fetch more');
 
     if (state.isFetching || !state.hasMore) return;
 
@@ -121,30 +122,36 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
   /// Refresh data silently without showing loading indicators.
   /// Used for automatic polling to update data in background.
   Future<void> silentRefresh() async {
-    print('UnifiedPaginationController: Silent refresh called');
+    quantusDebugPrint('UnifiedPaginationController: Silent refresh called');
     if (state.isFetching) return;
 
     final targetAccountIds = _getAccountIds();
     if (targetAccountIds.isEmpty) return;
 
-    await _silentFetchFirstPage(targetAccountIds);
+    state = state.copyWith(isFetching: true);
+
+    try {
+      await _silentFetchFirstPage(targetAccountIds);
+    } finally {
+      state = state.copyWith(isFetching: false);
+    }
   }
 
   /// Refresh data with loading indicators.
   /// Used for user-initiated refreshes like pull-to-refresh.
   Future<void> loadingRefresh() async {
-    print('UnifiedPaginationController: Loading Refresh');
+    quantusDebugPrint('UnifiedPaginationController: Loading Refresh');
 
     // Check connectivity before refreshing
     final isOnline = ref.read(isOnlineProvider);
     if (!isOnline) {
-      print('Skipping refresh - offline');
+      quantusDebugPrint('Skipping refresh - offline');
       return;
     }
 
     final targetAccountIds = _getAccountIds();
     if (targetAccountIds.isEmpty) {
-      state = PaginationState.initial().copyWith(hasMore: false);
+      state = PaginationState.initial().copyWith(hasMore: false, isLoading: false);
       return;
     }
 
@@ -168,27 +175,26 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
         otherOffset: newTransactions.nextOtherOffset,
         scheduledOffset: newTransactions.nextScheduledOffset,
         hasMore: newTransactions.hasMore,
-        error: null,
-        stackTrace: null,
+        clearError: true,
       );
     } catch (e, st) {
-      print('Silent refresh failed: $e, $st');
+      quantusDebugPrint('Silent refresh failed: $e, $st');
     }
   }
 
   /// Update a reversible transfer status to executed inline without full
   /// refresh.
   /// Moves the transfer from reversibleTransfers to the top of items list.
   void updateReversibleTransferToExecuted(String txId, ReversibleTransferStatus newStatus) {
-    print('Updating reversible transfer to executed: $txId');
+    quantusDebugPrint('Updating reversible transfer to executed: $txId');
 
     // Find the reversible transfer with the matching hash
     final reversibleTransfer = state.scheduledReversibleTransfers
         .where((transfer) => transfer.txId == txId)
         .firstOrNull;
 
     if (reversibleTransfer == null) {
-      print('Reversible transfer not found for txId: $txId');
+      quantusDebugPrint('Reversible transfer not found for txId: $txId');
       return;
     }
 
@@ -221,13 +227,13 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
       scheduledReversibleTransfers: updatedScheduledReversibleTransfers,
     );
 
-    print('Successfully moved transfer from reversible to executed');
+    quantusDebugPrint('Successfully moved transfer from reversible to executed');
   }
 
   /// Adds a newly found transaction to the top of the history list.
   /// This is used when a broadcast transaction is found in blockchain history.
   void addTransactionToHistory(TransactionEvent transaction) {
-    print('Adding transaction to history: ${transaction.id}');
+    quantusDebugPrint('Adding transaction to history: ${transaction.id}');
 
     // Check if transaction already exists to avoid duplicates
     final existsInOtherTransfers = state.otherTransfers.any((item) => item.id == transaction.id);
@@ -236,7 +242,7 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
     );
 
     if (existsInOtherTransfers || existsInScheduledReversibleTransfers) {
-      print('Transaction ${transaction.id} already exists in history');
+      quantusDebugPrint('Transaction ${transaction.id} already exists in history');
       return;
     }
 
@@ -250,6 +256,6 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
       state = state.copyWith(otherTransfers: updatedOtherTransfers);
     }
 
-    print('Successfully added transaction ${transaction.id} to history');
+    quantusDebugPrint('Successfully added transaction ${transaction.id} to history');
   }
 }

mobile-app/lib/providers/filtered_all_transactions_provider.dart

@@ -8,6 +8,7 @@ import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/controllers/unified_pagination_controller.dart';
 import 'package:resonance_network_wallet/providers/pending_cancellations_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_transactions_provider.dart';
+import 'package:resonance_network_wallet/shared/utils/print.dart';
 
 /// Family provider for filtered pagination controllers.
 ///
@@ -31,11 +32,14 @@ final filteredTransactionsProviderFamily =
       final pending = ref.watch(pendingTransactionsProvider);
       final pagination = ref.watch(filteredPaginationControllerProviderFamily(normalizedParams));
 
-      if (pagination.error != null) {
-        print('FilteredTransactionsProvider: Error: ${pagination.error}');
+      if (pagination.error != null && !pagination.hasLoadedChainData) {
+        quantusDebugPrint('FilteredTransactionsProvider: Error: ${pagination.error}');
         return AsyncValue.error(pagination.error!, pagination.stackTrace!);
       }
-      if (pagination.isFetching && pagination.otherTransfers.isEmpty) {
+      if (pagination.error != null) {
+        quantusDebugPrint('FilteredTransactionsProvider: Load-more error: ${pagination.error}');
+      }
+      if (pagination.isLoading && !pagination.hasLoadedChainData) {
         return const AsyncValue.loading();
       }
 

mobile-app/lib/v2/screens/accounts/create_account_screen.dart

@@ -29,9 +29,8 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
   List<Account> _accounts = [];
   int _walletIndex = 0;
   bool _isLoading = false;
-  String? _error;
 
-  bool get _isDisabled => _accountName.text.isEmpty || _isLoading || _error != null;
+  bool get _isDisabled => _accountName.text.trim().isEmpty || _isLoading;
 
   int _walletIndexForActiveAccount(List<Account> accounts, DisplayAccount? activeDisplayAccount) {
     if (activeDisplayAccount is RegularAccount) {
@@ -126,7 +125,7 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
 
     return ScaffoldBase(
       appBar: V2AppBar(title: l10n.createAccountAppBarTitle),
-      mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle, error: _error),
+      mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle),
       bottomContent: ScaffoldBaseBottomContent(
         child: QuantusButton.simple(
           label: l10n.createAccountButton,

mobile-app/lib/v2/screens/accounts/edit_account_screen.dart

@@ -24,6 +24,8 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
   final _accountsService = AccountsService();
   bool _saving = false;
 
+  bool get _isDisabled => _controller.text.trim().isEmpty;
+
   @override
   void initState() {
     super.initState();
@@ -82,6 +84,7 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
           label: l10n.editAccountDone,
           onTap: _save,
           isLoading: _saving,
+          isDisabled: _isDisabled,
         ),
       ),
     );