Optimize APK size

Reviewed-on: #47

.drone.yml

@@ -4,9 +4,17 @@ type: docker
 name: default
 
 steps:
+# Needs a full git clone
+- name: fetch
+  image: alpine/git
+  commands:
+  - git fetch --tags
+
 # Frontend
 - name: web_build
   image: node:23
+  depends_on:
+  - fetch
   volumes:
     - name: web_app
       path: /tmp/web_build
@@ -20,6 +28,8 @@ steps:
 # Backend
 - name: backend_fetch_deps
   image: rust
+  depends_on:
+  - fetch
   volumes:
     - name: rust_registry
       path: /usr/local/cargo/registry
@@ -54,6 +64,9 @@ steps:
 
 - name: backend_build
   image: rust
+  when:
+    event:
+      - tag
   volumes:
   - name: rust_registry
     path: /usr/local/cargo/registry
@@ -72,12 +85,58 @@ steps:
   - ls -lah target/release/moneymgr_backend target/release/examples/api_curl
   - cp target/release/moneymgr_backend target/release/examples/api_curl /tmp/release
 
+# Mobile app code quality
+- name: mobile_app_code_quality
+  image: ghcr.io/cirruslabs/flutter:latest
+  depends_on:
+  - fetch
+  commands:
+  - echo "Build version:" $(git describe --tags --abbrev=0)
+  - echo "Build number:" $(git rev-list --count $(git describe --tags --abbrev=0))
+  - cd moneymgr_mobile
+  - flutter --disable-analytics
+  - flutter pub get --enforce-lockfile
+  - dart run build_runner build
+  - flutter analyze
+
+# Mobile app build
+- name: mobile_app_build
+  image: ghcr.io/cirruslabs/flutter:latest
+  depends_on:
+  - backend_build # prevent synchronous backend & frontend build
+  - mobile_app_code_quality
+  when:
+    event:
+      - tag
+  environment:
+    JKS_KEYSTORE:
+      from_secret: JKS_KEYSTORE
+    JKS_KEYSTORE_PASSWORD:
+      from_secret: JKS_KEYSTORE_PASSWORD
+  volumes:
+  - name: release
+    path: /tmp/release
+  commands:
+  - cd moneymgr_mobile
+  - flutter --disable-analytics
+  - bash android/ci_write_keystore.sh
+  - flutter pub get --enforce-lockfile
+  - dart run build_runner build
+  - flutter build apk
+    --release
+    --flavor publish
+    --build-name $(git describe --tags --abbrev=0)
+    --split-per-abi
+    --target-platform android-arm64
+    --build-number $(git rev-list --count $(git describe --tags --abbrev=0))
+  - cp build/app/outputs/flutter-apk/app-arm64-v8a-publish-release.apk /tmp/release/moneymgr_mobile_arm64-v8a.apk
 
 # Release
 - name: gitea_release
   image: plugins/gitea-release
   depends_on:
   - backend_build
+  - mobile_app_build
   when:
     event:
       - tag

moneymgr_backend/Cargo.lock

@@ -724,9 +724,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -746,9 +746,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1100,9 +1100,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.2.11"
+version = "2.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a917a9209950404d5be011c81d081a2692a822f73c3d6af586f0cab5ff50f614"
+checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c"
 dependencies = [
  "bitflags",
  "byteorder",

moneymgr_backend/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2024"
 [dependencies]
 env_logger = "0.11.8"
 log = "0.4.27"
-diesel = { version = "2.2.11", features = ["postgres", "r2d2"] }
+diesel = { version = "2.2.12", features = ["postgres", "r2d2"] }
 diesel_migrations = "2.2.0"
-clap = { version = "4.5.40", features = ["env", "derive"] }
+clap = { version = "4.5.41", features = ["env", "derive"] }
 actix-web = "4.11.0"
 actix-cors = "0.7.1"
 actix-multipart = "0.7.2"

moneymgr_backend/src/extractors/auth_extractor.rs

@@ -56,7 +56,7 @@ impl FromRequest for AuthExtractor {
         };
 
         Box::pin(async move {
-            // Check for authentication using OpenID
+            // Check for authentication using API token
             if let Some(token) = req.headers().get(constants::API_TOKEN_HEADER) {
                 let Ok(jwt_token) = token.to_str() else {
                     return Err(actix_web::error::ErrorBadRequest(

moneymgr_mobile/android/.gitignore

@@ -1,3 +1,5 @@
+publish_key.properties
+
 gradle-wrapper.jar
 /.gradle
 /captures/

moneymgr_mobile/android/README.md

@@ -0,0 +1,8 @@
+# Android version of application
+
+Generate keystore:
+
+```bash
+keytool -genkey -v -keystore ./keystore.jks -keyalg RSA \
+        -keysize 2048 -validity 20000 -alias moneymgr
+```

moneymgr_mobile/android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +8,12 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("publish_key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "org.communiquons.moneymgr"
     compileSdk = flutter.compileSdkVersion
@@ -21,7 +30,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "org.communiquons.moneymgr"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
@@ -31,13 +39,34 @@ android {
         versionName = flutter.versionName
     }
 
-    buildTypes {
+    signingConfigs {
-        release {
+        create("publish") {
-            // TODO: Add your own signing config for the release build.
+            keyAlias = keystoreProperties["keyAlias"] as String
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            keyPassword = keystoreProperties["keyPassword"] as String
-            signingConfig = signingConfigs.getByName("debug")
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
         }
     }
+
+    buildTypes {
+        release {
+            // signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+
+    flavorDimensions += "default"
+    productFlavors {
+        create("development") {
+            dimension = "default"
+            applicationIdSuffix = ".debug"
+            signingConfig = signingConfigs.getByName("debug")
+        }
+        create("publish") {
+            dimension = "default"
+            signingConfig = signingConfigs.getByName("publish")
+        }
+    }
+
 }
 
 flutter {

moneymgr_mobile/android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
@@ -6,5 +7,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- In debug mode, unsecure traffic is permitted -->
-    <application android:usesCleartextTraffic="true" />
+    <application
+        android:label="MoneyMgr Debug"
+        android:usesCleartextTraffic="true"
+        tools:replace="android:label" />
 </manifest>

moneymgr_mobile/android/app/src/publish/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="false" />
+</manifest>

moneymgr_mobile/android/app/src/publish/res/xml/data_extraction_rules.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" />
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>

moneymgr_mobile/android/ci_write_keystore.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(temp=$( realpath "$0"  ) && dirname "$temp")"
+
+KEYSTORE_PATH="$SCRIPT_DIR/keystore.jks"
+PROPERTIES_PATH="$SCRIPT_DIR/publish_key.properties"
+
+echo Keystore path : $KEYSTORE_PATH
+echo Properties path : $PROPERTIES_PATH
+
+[ ! -n "$JKS_KEYSTORE" ] && echo 'Missing JKS_KEYSTORE variable!'&& exit 1
+[ ! -n "$JKS_KEYSTORE_PASSWORD" ] && echo 'Missing JKS_KEYSTORE_PASSWORD variable!' && exit 1
+
+# Write keystore
+echo $JKS_KEYSTORE | base64 -d > "$KEYSTORE_PATH"
+
+# Write keystore config
+cat > "$PROPERTIES_PATH" <<_EOF
+storePassword=$JKS_KEYSTORE_PASSWORD
+keyPassword=$JKS_KEYSTORE_PASSWORD
+keyAlias=moneymgr
+storeFile=$KEYSTORE_PATH
+_EOF

moneymgr_mobile/android/publish_key.properties.sample

@@ -0,0 +1,4 @@
+storePassword=<password-from-previous-step>
+keyPassword=<password-from-previous-step>
+keyAlias=upload
+storeFile=<keystore-file-location>

moneymgr_mobile/lib/routes/scan/scan_screen.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
+import 'package:moneymgr_mobile/services/storage/expenses.dart';
 import 'package:moneymgr_mobile/widgets/expense_editor.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:scanbot_sdk/scanbot_sdk.dart';
@@ -11,6 +12,7 @@ import 'package:scanbot_sdk/scanbot_sdk_ui_v2.dart' hide IconButton, EdgeInsets;
 
 part 'scan_screen.g.dart';
 
+/// Scan a document & return generated PDF as byte file
 @riverpod
 Future<Uint8List?> _scanDocument(Ref ref) async {
   var configuration = DocumentScanningFlow(
@@ -45,7 +47,8 @@ class ScanScreen extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final boredSuggestion = ref.watch(_scanDocumentProvider);
+    final scanDocProvider = ref.watch(_scanDocumentProvider);
+    final expenses = ref.watch(expensesProvider).requireValue;
 
     restartScan() async {
       try {
@@ -56,13 +59,19 @@ class ScanScreen extends HookConsumerWidget {
       }
     }
 
-    // Perform a switch-case on the result to handle loading/error states
     return Padding(
       padding: const EdgeInsets.all(8.0),
-      child: switch (boredSuggestion) {
+      child: switch (scanDocProvider) {
         AsyncData(:final value) when value != null => ExpenseEditor(
           file: value,
-          onFinished: (e) {},
+          onFinished: (expense) async {
+            await expenses.add(
+              info: expense,
+              fileContent: value,
+              fileMimeType: "application/pdf",
+            );
+            restartScan();
+          },
           onRescan: restartScan,
         ),
 
@@ -103,7 +112,7 @@ class ScanErrorScreen extends StatelessWidget {
           Spacer(flex: 5),
           Text("An error occurred while scanning"),
           Spacer(flex: 1),
-          Text(message),
+          Text(message, textAlign: TextAlign.center),
           Spacer(flex: 1),
           MaterialButton(
             onPressed: onTryAgain,

moneymgr_mobile/lib/routes/scan_details/scan_details.dart

@@ -0,0 +1,86 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:moneymgr_mobile/services/storage/expenses.dart';
+import 'package:moneymgr_mobile/utils/extensions.dart';
+import 'package:moneymgr_mobile/widgets/expense_editor.dart';
+import 'package:moneymgr_mobile/widgets/full_screen_error.dart';
+import 'package:moneymgr_mobile/widgets/loading_scaffold.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'scan_details.g.dart';
+
+@riverpod
+Future<(Expense, Uint8List)?> _getExpense(Ref ref, {required int id}) async {
+  final expProvider = ref.watch(expensesProvider).requireValue;
+  final expense = await expProvider.getById(id);
+  if (expense == null) return null;
+  final file = await expProvider.loadFile(expense);
+
+  return (expense, file);
+}
+
+class ScanDetailScreen extends HookConsumerWidget {
+  final int id;
+
+  const ScanDetailScreen({super.key, required this.id});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final expenses = ref.watch(expensesProvider).requireValue;
+    final expense = ref.watch(_getExpenseProvider(id: id));
+
+    handleUpdate(BaseExpenseInfo newInfo) async {
+      try {
+        await expenses.updateExpense(expense.requireValue!.$1, newInfo);
+        if (context.mounted) {
+          context.pop();
+        }
+
+        ref.invalidate(expensesProvider);
+      } catch (e, s) {
+        Logger.root.warning("Failed to update expense! $e$s");
+        if (context.mounted) {
+          context.showTextSnackBar("Failed to update expense! $e");
+        }
+      }
+    }
+
+    handleDelete() async {
+      try {
+        await expenses.deleteExpense(expense.requireValue!.$1);
+        if (context.mounted) {
+          context.pop();
+        }
+
+        ref.invalidate(expensesProvider);
+      } catch (e, s) {
+        Logger.root.warning("Failed to delete expense! $e$s");
+        if (context.mounted) {
+          context.showTextSnackBar("Failed to delete expense! $e");
+        }
+      }
+    }
+
+    return switch (expense) {
+      AsyncData(:final value) when value == null => FullScreenError(
+        message: "Expense does not exists!",
+        error: 'NONE',
+      ),
+      AsyncData(:final value) => ExpenseEditor(
+        file: value!.$2,
+        initialData: value.$1.baseExpense,
+        onFinished: handleUpdate,
+        onDelete: handleDelete,
+      ),
+      AsyncError(:final error) => FullScreenError(
+        message: "Failed to load expense information!",
+        error: error.toString(),
+      ),
+      _ => LoadingScaffold(title: "Expense $id"),
+    };
+  }
+}

moneymgr_mobile/lib/routes/scans_list/scans_list_screen.dart

@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moneymgr_mobile/services/router/routes_list.dart';
+import 'package:moneymgr_mobile/services/storage/expenses.dart';
+import 'package:moneymgr_mobile/utils/time_utils.dart';
+import 'package:moneymgr_mobile/widgets/full_screen_error.dart';
+import 'package:moneymgr_mobile/widgets/loading_scaffold.dart';
+import 'package:moneymgr_mobile/widgets/synchronize_button.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'scans_list_screen.g.dart';
+
+@riverpod
+Future<ExpensesList> _expensesList(Ref ref) {
+  final expenses = ref.watch(expensesProvider).requireValue;
+  return expenses.getList();
+}
+
+class ScansListScreen extends HookConsumerWidget {
+  const ScansListScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final expensesList = ref.watch(_expensesListProvider);
+
+    return switch (expensesList) {
+      AsyncData(:final value) => Scaffold(
+        appBar: AppBar(
+          title: Text("Expenses"),
+          actions: [value.isEmpty ? Container() : SynchronizeButton()],
+        ),
+        body: _ExpensesList(list: value),
+      ),
+      AsyncError(:final error) => FullScreenError(
+        message: "Failed to load the list of expenses",
+        error: error.toString(),
+      ),
+      _ => const LoadingScaffold(title: "Expenses"),
+    };
+  }
+}
+
+class _ExpensesList extends StatelessWidget {
+  final ExpensesList list;
+
+  const _ExpensesList({required this.list});
+
+  @override
+  Widget build(BuildContext context) {
+    if (list.isEmpty) {
+      return const Center(
+        child: Text("There is no entry waiting for upload (yet)"),
+      );
+    }
+
+    return ListView.builder(
+      itemBuilder: (context, entryNum) {
+        final expense = list[entryNum];
+        return ListTile(
+          onTap: () => context.push("$scansPage/${expense.id}"),
+          leading: Icon(Icons.receipt_long),
+          title: Text(
+            expense.label ?? "No label",
+            style: TextStyle(
+              fontStyle: expense.label == null ? FontStyle.italic : null,
+            ),
+          ),
+          subtitle: Text(expense.dateTime.simpleDate),
+          trailing: Text("${expense.cost} €", style: TextStyle(fontSize: 20)),
+        );
+      },
+      itemCount: list.length,
+    );
+  }
+}

moneymgr_mobile/lib/routes/settings/settings_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:moneymgr_mobile/providers/settings.dart';
+import 'package:moneymgr_mobile/services/storage/prefs.dart';
 import 'package:moneymgr_mobile/utils/extensions.dart';
 
 class SettingsScreen extends ConsumerWidget {
@@ -8,6 +9,7 @@ class SettingsScreen extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final prefs = ref.watch(prefsProvider).requireValue;
     final themeMode = ref.watch(currentThemeModeProvider);
 
     void onTapThemeMode() =>
@@ -15,6 +17,11 @@ class SettingsScreen extends ConsumerWidget {
 
     void onTapLicenses() => context.showAppLicensePage();
 
+    handleToggleStartScreen(v) async {
+      await prefs.setStartOnScansListScreen(v);
+      ref.invalidate(prefsProvider);
+    }
+
     return Scaffold(
       appBar: AppBar(title: const Text('Settings')),
       body: ListView(
@@ -25,6 +32,14 @@ class SettingsScreen extends ConsumerWidget {
             trailing: Text(themeMode.label),
             onTap: onTapThemeMode,
           ),
+          SwitchListTile(
+            value: prefs.startOnScansListScreen(),
+            onChanged: handleToggleStartScreen,
+            title: Text("Start on scans screen"),
+            subtitle: Text(
+              "Do not start camera automatically on application startup",
+            ),
+          ),
           const Divider(),
           ListTile(
             leading: const Icon(Icons.info_outline),

moneymgr_mobile/lib/services/api/api_client.dart

@@ -24,7 +24,11 @@ class ApiClient {
     : client = Dio(BaseOptions(baseUrl: token.apiUrl));
 
   /// Get Dio instance
-  Future<Response<T>> execute<T>(String uri, {String method = "GET"}) async {
+  Future<Response<T>> execute<T>(
+    String uri, {
+    String method = "GET",
+    Object? data,
+  }) async {
     Logger.root.fine("Request on ${token.apiUrl} - URI $uri");
     return client.request(
       uri,
@@ -32,6 +36,7 @@ class ApiClient {
         method: method,
         headers: {apiTokenHeader: _genJWT(method, uri)},
       ),
+      data: data,
     );
   }
 

moneymgr_mobile/lib/services/api/files_api.dart

@@ -0,0 +1,43 @@
+import 'dart:typed_data';
+
+import 'package:dio/dio.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:logging/logging.dart';
+import 'package:moneymgr_mobile/services/api/api_client.dart';
+
+part 'files_api.freezed.dart';
+part 'files_api.g.dart';
+
+@freezed
+abstract class UploadResult with _$UploadResult {
+  const factory UploadResult({required int id}) = _UploadResult;
+
+  factory UploadResult.fromJson(Map<String, dynamic> json) =>
+      _$UploadResultFromJson(json);
+}
+
+extension FilesApi on ApiClient {
+  /// Upload a file
+  Future<UploadResult> uploadFile({
+    required String filename,
+    required String mimeType,
+    required Uint8List bytes,
+  }) async {
+    final res = await execute(
+      "/file",
+      method: "POST",
+      data: FormData.fromMap({
+        "file": MultipartFile.fromBytes(
+          bytes,
+          filename: filename,
+          contentType: MediaType.parse(mimeType),
+        ),
+      }),
+    );
+
+    Logger.root.fine("Successfully uploaded file with response=${res.data}");
+
+    return UploadResult.fromJson(res.data);
+  }
+}

moneymgr_mobile/lib/services/api/inbox_api.dart

@@ -0,0 +1,27 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import 'api_client.dart';
+
+part 'inbox_api.freezed.dart';
+part 'inbox_api.g.dart';
+
+@freezed
+abstract class UpdateInboxEntryRequest with _$UpdateInboxEntryRequest {
+  const factory UpdateInboxEntryRequest({
+    // ignore: non_constant_identifier_names
+    required int file_id,
+    required int time,
+    required String? label,
+    required double? amount,
+  }) = _UpdateInboxEntryRequest;
+
+  factory UpdateInboxEntryRequest.fromJson(Map<String, dynamic> json) =>
+      _$UpdateInboxEntryRequestFromJson(json);
+}
+
+extension InboxApi on ApiClient {
+  /// Create a new inbox entry
+  Future<void> createInboxEntry(UpdateInboxEntryRequest entry) async {
+    await execute("/inbox", method: "POST", data: entry.toJson());
+  }
+}

moneymgr_mobile/lib/services/router/router.dart

@@ -7,8 +7,11 @@ import 'package:moneymgr_mobile/routes/login/manual_auth_screen.dart';
 import 'package:moneymgr_mobile/routes/login/qr_auth_screen.dart';
 import 'package:moneymgr_mobile/routes/profile/profile_screen.dart';
 import 'package:moneymgr_mobile/routes/scan/scan_screen.dart';
+import 'package:moneymgr_mobile/routes/scan_details/scan_details.dart';
+import 'package:moneymgr_mobile/routes/scans_list/scans_list_screen.dart';
 import 'package:moneymgr_mobile/routes/settings/settings_screen.dart';
 import 'package:moneymgr_mobile/services/router/routes_list.dart';
+import 'package:moneymgr_mobile/services/storage/prefs.dart';
 import 'package:moneymgr_mobile/widgets/load_startup_data.dart';
 import 'package:moneymgr_mobile/widgets/scaffold_with_navigation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -27,6 +30,8 @@ GoRouter router(Ref ref) {
       authStateNotifier.value = value;
     });
 
+  final prefs = ref.read(prefsProvider).requireValue;
+
   // This is the only place you need to define your navigation items. The items
   // will be propagated automatically to the router and the navigation bar/rail
   // of the scaffold.
@@ -35,12 +40,28 @@ GoRouter router(Ref ref) {
   // see [AuthState] enum.
   final navigationItems = [
     NavigationItem(
-      path: scanPage,
+      path: capturePage,
       body: (_) => ScanScreen(),
       icon: Icons.camera_alt_outlined,
       selectedIcon: Icons.camera_alt,
       label: "Scan",
     ),
+    NavigationItem(
+      path: scansPage,
+      body: (_) => ScansListScreen(),
+      icon: Icons.list,
+      selectedIcon: Icons.list_alt,
+      label: "List",
+      routes: [
+        GoRoute(
+          path: ":id",
+          builder: (_, state) {
+            final id = int.parse(state.pathParameters["id"]!);
+            return ScanDetailScreen(id: id);
+          },
+        ),
+      ],
+    ),
     NavigationItem(
       path: profilePage,
       body: (_) => ProfileScreen(),
@@ -52,22 +73,22 @@ GoRouter router(Ref ref) {
 
   final router = GoRouter(
     debugLogDiagnostics: true,
-    initialLocation: navigationItems.first.path,
+    initialLocation: prefs.startOnScansListScreen() ? scansPage : capturePage,
     routes: [
-      GoRoute(path: homePage, builder: (_, __) => const Scaffold()),
+      GoRoute(path: homePage, builder: (_, _) => const Scaffold()),
-      GoRoute(path: authPage, builder: (_, __) => const LoginScreen()),
+      GoRoute(path: authPage, builder: (_, _) => const LoginScreen()),
-      GoRoute(path: qrAuthPath, builder: (_, __) => const QrAuthScreen()),
+      GoRoute(path: qrAuthPath, builder: (_, _) => const QrAuthScreen()),
       GoRoute(
         path: manualAuthPage,
-        builder: (_, __) => const ManualAuthScreen(),
+        builder: (_, _) => const ManualAuthScreen(),
       ),
-      GoRoute(path: settingsPage, builder: (_, __) => const SettingsScreen()),
+      GoRoute(path: settingsPage, builder: (_, _) => const SettingsScreen()),
 
       // Configuration for the bottom navigation bar routes. The routes themselves
       // should be defined in [navigationItems]. Modification to this [ShellRoute]
       // config is rarely needed.
       ShellRoute(
-        builder: (_, __, child) => child,
+        builder: (_, _, child) => child,
         routes: [
           for (final (index, item) in navigationItems.indexed)
             GoRoute(

moneymgr_mobile/lib/services/router/routes_list.dart

@@ -13,8 +13,11 @@ const manualAuthPage = "/login/manual";
 /// Settings path
 const settingsPage = "/settings";
 
-/// Scan URL path
+/// Scan path
-const scanPage = "/scan";
+const capturePage = "/scan";
+
+/// Scans page
+const scansPage = "/scans";
 
 /// Profile path
 const profilePage = "/profile";

moneymgr_mobile/lib/services/storage/expenses.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
+import 'dart:typed_data';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -15,11 +16,16 @@ typedef ExpensesList = List<Expense>;
 
 @freezed
 abstract class BaseExpenseInfo with _$BaseExpenseInfo {
+  const BaseExpenseInfo._();
+
   const factory BaseExpenseInfo({
-    required String label,
+    required String? label,
-    required int cost,
+    required double cost,
     required DateTime time,
   }) = _BaseExpenseInfo;
+
+  /// Get expense time as second
+  int get timeAsSeconds => (time.millisecondsSinceEpoch / 1000).floor();
 }
 
 @freezed
@@ -36,7 +42,7 @@ abstract class Expense with _$Expense {
     /// The cost shall always be a positive value
     required double cost,
 
-    /// Time associated with the expense
+    /// Time associated with the expense (seconds since epoch)
     required int time,
 
     /// Associated file mime type
@@ -46,6 +52,10 @@ abstract class Expense with _$Expense {
   factory Expense.fromJson(Map<String, dynamic> json) =>
       _$ExpenseFromJson(json);
 
+  /// Get base expense information
+  BaseExpenseInfo get baseExpense =>
+      BaseExpenseInfo(label: label, cost: cost, time: dateTime);
+
   /// Get associated expense file name
   String get localFileName {
     if (mimeType == "application/pdf") return "$id.pdf";
@@ -53,6 +63,9 @@ abstract class Expense with _$Expense {
     if (mimeType == "image/png") return "$id.png";
     return id.toString();
   }
+
+  /// Get expense date
+  DateTime get dateTime => DateTime.fromMillisecondsSinceEpoch(time * 1000);
 }
 
 @riverpod
@@ -80,21 +93,24 @@ class ExpensesManager {
 
   /// Get the current list of expenses
   Future<ExpensesList> getList() async {
+    // On first save the list does not exists.
+    if (!await expenseFile.exists()) {
+      return [];
+    }
+
     final jsonDec = jsonDecode(await expenseFile.readAsString());
     return List<Expense>.from(jsonDec.map((m) => Expense.fromJson(m)));
   }
 
   /// Save the list of expenses
   Future<void> saveList(ExpensesList list) async {
-    final jsonDoc = jsonEncode(list.map((t) => t.toJson()));
+    final jsonDoc = jsonEncode(list.map((t) => t.toJson()).toList());
     await expenseFile.writeAsString(jsonDoc);
   }
 
   /// Add a new expense to the list
   Future<void> add({
-    required String? label,
+    required BaseExpenseInfo info,
-    required double cost,
-    required int time,
     required List<int> fileContent,
     required String fileMimeType,
   }) async {
@@ -102,9 +118,9 @@ class ExpensesManager {
 
     final exp = Expense(
       id: (list.lastOrNull?.id ?? 0) + Random().nextInt(1000),
-      label: label,
+      label: info.label,
-      cost: cost,
+      cost: info.cost,
-      time: time,
+      time: info.timeAsSeconds,
       mimeType: fileMimeType,
     );
 
@@ -123,4 +139,45 @@ class ExpensesManager {
     list.add(exp);
     await saveList(list);
   }
+
+  /// Get a single expense information by its ID
+  Future<Expense?> getById(int id) async {
+    final list = await getList();
+    return list.firstWhere((e) => e.id == id);
+  }
+
+  /// Load the file associated with an expense
+  Future<Uint8List> loadFile(Expense expense) async {
+    final path = p.join(filesStoragePath.absolute.path, expense.localFileName);
+    return File(path).readAsBytes();
+  }
+
+  /// Update expense information
+  Future<void> updateExpense(Expense expense, BaseExpenseInfo newInfo) async {
+    final list = await getList();
+    final entry = list.indexWhere((e) => e.id == expense.id);
+    list[entry] = Expense(
+      id: expense.id,
+      label: newInfo.label,
+      cost: newInfo.cost,
+      time: newInfo.timeAsSeconds,
+      mimeType: expense.mimeType,
+    );
+    saveList(list);
+  }
+
+  /// Delete an expense
+  Future<void> deleteExpense(Expense expense) async {
+    // Remove expense from the list
+    final list = await getList();
+    await saveList(list.where((e) => e.id != expense.id).toList());
+
+    // Delete associated file, if any
+    final filePath = File(
+      p.join(filesStoragePath.absolute.path, expense.localFileName),
+    );
+    if (await filePath.exists()) {
+      await filePath.delete();
+    }
+  }
 }

moneymgr_mobile/lib/services/storage/prefs.dart

@@ -15,6 +15,14 @@ Future<SharedPreferencesWithCache> prefs(Ref ref) =>
     );
 
 extension MoneyMgrSharedPreferences on SharedPreferencesWithCache {
+  bool startOnScansListScreen() {
+    return getBool("startOnScansListScreen") ?? false;
+  }
+
+  Future<void> setStartOnScansListScreen(bool start) async {
+    await setBool("startOnScansListScreen", start);
+  }
+
   ServerConfig? serverConfig() {
     final json = getString("serverConfig");
     if (json != null) return ServerConfig.fromJson(jsonDecode(json));

moneymgr_mobile/lib/utils/pdf_utils.dart

@@ -0,0 +1,65 @@
+import 'dart:io';
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+import 'package:pdf_image_renderer/pdf_image_renderer.dart';
+
+
+/// Render PDF to image bits
+Future<Uint8List> renderPdf(
+     {
+      String? path,
+      Uint8List? pdfBytes,
+    }) async {
+  assert(path != null || pdfBytes != null);
+
+  // Create temporary file if required
+  var isTemp = false;
+  if (path == null) {
+    path = p.join(
+      (await getTemporaryDirectory()).absolute.path,
+      "render-${Random().nextInt(10000).toString()}+.pdf",
+    );
+
+    await File(path).writeAsBytes(pdfBytes!);
+    isTemp = true;
+  }
+
+  try {
+    final pdf = PdfImageRenderer(path: path);
+    await pdf.open();
+    await pdf.openPage(pageIndex: 0);
+
+    // get the render size after the page is loaded
+    final size = await pdf.getPageSize(pageIndex: 0);
+
+    // get the actual image of the page
+    final img = await pdf.renderPage(
+      pageIndex: 0,
+      x: 0,
+      y: 0,
+      width: size.width,
+      // you can pass a custom size here to crop the image
+      height: size.height,
+      // you can pass a custom size here to crop the image
+      scale: 1,
+      // increase the scale for better quality (e.g. for zooming)
+      background: Colors.white,
+    );
+
+    // close the page again
+    await pdf.closePage(pageIndex: 0);
+
+    // close the PDF after rendering the page
+    pdf.close();
+
+    return img!;
+  } finally {
+    if (isTemp) {
+      await File(path).delete();
+    }
+  }
+}

moneymgr_mobile/lib/widgets/expense_editor.dart

@@ -1,36 +1,44 @@
 import 'dart:typed_data';
 
-import 'package:alert_dialog/alert_dialog.dart';
 import 'package:confirm_dialog/confirm_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_pdfview/flutter_pdfview.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:logging/logging.dart';
 import 'package:moneymgr_mobile/services/storage/expenses.dart';
 import 'package:moneymgr_mobile/services/storage/prefs.dart';
 import 'package:moneymgr_mobile/utils/extensions.dart';
 import 'package:moneymgr_mobile/utils/time_utils.dart';
+import 'package:moneymgr_mobile/widgets/pdf_viewer.dart';
+
+import '../utils/hooks.dart';
 
 class ExpenseEditor extends HookConsumerWidget {
   final Uint8List file;
-  final Function(BaseExpenseInfo) onFinished;
+  final Future<void> Function(BaseExpenseInfo) onFinished;
   final Function()? onRescan;
+  final Function()? onDelete;
+  final BaseExpenseInfo? initialData;
 
   const ExpenseEditor({
     super.key,
     required this.file,
     required this.onFinished,
-    required this.onRescan,
+    this.onRescan,
+    this.onDelete,
+    this.initialData,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final serverConfig = ref.watch(prefsProvider).requireValue.serverConfig()!;
 
-    final labelController = useTextEditingController();
+    final labelController = useTextEditingController(text: initialData?.label);
-    final costController = useTextEditingController();
+    final costController = useTextEditingController(
-    final timeController = useState(DateTime.now());
+      text: initialData?.cost.toString(),
+    );
+    final timeController = useState(initialData?.time ?? DateTime.now());
+
+    final (:pending, :snapshot, :hasError) = useAsyncTask();
 
     // Pick a new date
     handlePickDate() async {
@@ -50,13 +58,18 @@ class ExpenseEditor extends HookConsumerWidget {
         return;
       }
 
-      onFinished(
+      pending.value = onFinished(
         BaseExpenseInfo(
-          label: labelController.text,
+          label: labelController.text.isEmpty ? null : labelController.text,
-          cost: int.tryParse(costController.text) ?? 0,
+          cost: double.tryParse(costController.text) ?? 0,
           time: timeController.value,
         ),
       );
+
+      // Reset screen after a scan
+      await pending.value;
+      labelController.text = "";
+      costController.text = "";
     }
 
     // Cancel operation
@@ -70,32 +83,49 @@ class ExpenseEditor extends HookConsumerWidget {
       }
     }
 
+    // Delete expense
+    handleDelete() async {
+      if (await confirm(
+            context,
+            content: Text("Do you really want to delete this expense?"),
+          ) &&
+          onDelete != null) {
+        onDelete!();
+      }
+    }
+
     return Scaffold(
       appBar: AppBar(
         title: Text("Expense info"),
         actions: [
           // Rescan expense
-          IconButton(
+          onRescan == null
-            onPressed: onRescan == null ? null : handleRescan,
+              ? Container()
-            icon: Icon(Icons.restart_alt),
+              : IconButton(
-          ),
+                  onPressed: handleRescan,
+                  icon: Icon(Icons.restart_alt),
+                ),
+
+          // Delete expense
+          onDelete == null
+              ? Container()
+              : IconButton(onPressed: handleDelete, icon: Icon(Icons.delete)),
 
           // Submit
-          IconButton(onPressed: handleSubmit, icon: Icon(Icons.save)),
+          snapshot.connectionState == ConnectionState.waiting
+              ? CircularProgressIndicator()
+              : IconButton(
+                  onPressed: handleSubmit,
+                  icon: Icon(Icons.save),
+                  color: hasError ? Colors.red : null,
+                ),
         ],
       ),
       body: Column(
         children: [
           // Expense preview
           Expanded(
-            child: PDFView(
+            child: PDFViewer(pdfBytes: file, fit: BoxFit.contain),
-              pdfData: file,
-              onError: (e) {
-                Logger.root.warning("Failed to render PDF $e");
-                alert(context, content: Text("Failed to render PDF $e"));
-              },
-              fitPolicy: FitPolicy.BOTH,
-            ),
           ),
 
           SizedBox(height: 10),
@@ -103,7 +133,10 @@ class ExpenseEditor extends HookConsumerWidget {
           // Cost
           TextField(
             controller: costController,
-            keyboardType: TextInputType.number,
+            keyboardType: TextInputType.numberWithOptions(
+              decimal: true,
+              signed: false,
+            ),
             decoration: const InputDecoration(labelText: 'Cost'),
             textInputAction: TextInputAction.done,
           ),

moneymgr_mobile/lib/widgets/loading_scaffold.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class LoadingScaffold extends StatelessWidget {
+  final String title;
+
+  const LoadingScaffold({super.key, required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(title)),
+      body: Center(child: CircularProgressIndicator()),
+    );
+  }
+}

moneymgr_mobile/lib/widgets/pdf_viewer.dart

@@ -0,0 +1,53 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moneymgr_mobile/utils/pdf_utils.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'pdf_viewer.g.dart';
+
+@riverpod
+Future<Uint8List> _renderPdf(
+  Ref ref, {
+  String? path,
+  Uint8List? pdfBytes,
+}) async {
+  return renderPdf(path: path, pdfBytes: pdfBytes);
+}
+
+class PDFViewer extends ConsumerWidget {
+  final String? pdfPath;
+  final Uint8List? pdfBytes;
+  final double? width;
+  final double? height;
+  final BoxFit? fit;
+
+  const PDFViewer({
+    super.key,
+    this.pdfPath,
+    this.pdfBytes,
+    this.width,
+    this.height,
+    this.fit,
+  }) : assert(pdfPath != null || pdfBytes != null);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final provider = ref.watch(
+      _renderPdfProvider(path: pdfPath, pdfBytes: pdfBytes),
+    );
+
+    // Perform a switch-case on the result to handle loading/error states
+    return switch (provider) {
+      AsyncData(:final value) => Image(
+        image: MemoryImage(value),
+        width: width,
+        height: height,
+        fit: fit,
+      ),
+      AsyncError(:final error) => Text('PDF error: $error'),
+      _ => Center(child: const CircularProgressIndicator()),
+    };
+  }
+}

moneymgr_mobile/lib/widgets/synchronize_button.dart

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:logging/logging.dart';
+import 'package:moneymgr_mobile/services/api/api_client.dart';
+import 'package:moneymgr_mobile/services/api/files_api.dart';
+import 'package:moneymgr_mobile/services/api/inbox_api.dart';
+import 'package:moneymgr_mobile/services/storage/expenses.dart';
+import 'package:moneymgr_mobile/utils/extensions.dart';
+import 'package:moneymgr_mobile/utils/hooks.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'synchronize_button.g.dart';
+
+/// Synchronize expenses list with backend
+@riverpod
+Future<void> _performSynchronization(Ref ref) async {
+  final expenses = ref.watch(expensesProvider).requireValue;
+  final apiService = ref.watch(apiServiceProvider)!;
+
+  final list = await expenses.getList();
+
+  for (final exp in list) {
+    // First, upload file
+    final bytes = await expenses.loadFile(exp);
+    final file = await apiService.uploadFile(
+      filename: exp.localFileName,
+      mimeType: exp.mimeType,
+      bytes: bytes,
+    );
+
+    // Then, create the inbox entry
+    await apiService.createInboxEntry(
+      UpdateInboxEntryRequest(
+        file_id: file.id,
+        time: exp.time,
+        label: exp.label,
+        amount: -1 * exp.cost,
+      ),
+    );
+
+    // Lastly delete the local expense
+    ref.watch(expensesProvider).requireValue.deleteExpense(exp);
+  }
+
+  ref.invalidate(expensesProvider);
+}
+
+class SynchronizeButton extends HookConsumerWidget {
+  const SynchronizeButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final (:pending, :snapshot, :hasError) = useAsyncTask();
+
+    handleSynchronize() async {
+      try {
+        await ref.watch(
+          _performSynchronizationProvider.selectAsync((it) => it),
+        );
+      } catch (e, s) {
+        Logger.root.warning("Failed to synchronize expenses! $e $s");
+        if (context.mounted) {
+          context.showTextSnackBar("Failed to synchronize expenses! $e");
+        }
+      }
+    }
+
+    return snapshot.connectionState == ConnectionState.waiting
+        ? Padding(
+            padding: const EdgeInsets.all(12.0),
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          )
+        : IconButton(
+            onPressed: () => pending.value = handleSynchronize(),
+            style: ButtonStyle(
+              backgroundColor: hasError
+                  ? WidgetStatePropertyAll(Colors.red)
+                  : null,
+            ),
+            icon: Icon(Icons.sync_rounded),
+          );
+  }
+}

moneymgr_mobile/pubspec.lock

@@ -141,10 +141,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.11.0"
   characters:
     dependency: transitive
     description:
@@ -370,10 +370,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_native_splash:
     dependency: "direct main"
     description:
@@ -382,14 +382,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.6"
-  flutter_pdfview:
-    dependency: "direct main"
-    description:
-      name: flutter_pdfview
-      sha256: c402ad1f51ba8ea73b9fb04c003ca0a9286118ba5ac9787ee2aa58956b3fcf8a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1+1"
   flutter_riverpod:
     dependency: transitive
     description:
@@ -460,18 +452,18 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c"
+      sha256: "2d399f823b8849663744d2a9ddcce01c49268fb4170d0442a655bf6a2f47be22"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -492,10 +484,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: ac294be30ba841830cfa146e5a3b22bb09f8dc5a0fdd9ca9332b04b0bde99ebf
+      sha256: c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.4"
+    version: "16.0.0"
   graphs:
     dependency: transitive
     description:
@@ -537,7 +529,7 @@ packages:
     source: hosted
     version: "3.2.2"
   http_parser:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http_parser
       sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
@@ -612,10 +604,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
+      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.0.0"
   logging:
     dependency: "direct main"
     description:
@@ -728,6 +720,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  pdf_image_renderer:
+    dependency: "direct main"
+    description:
+      name: pdf_image_renderer
+      sha256: "0ec76118b14663f17f9b6a8c29ec59cb1b82e466a3c16fbb2ed9f1b613fc41b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   petitparser:
     dependency: transitive
     description:
@@ -921,10 +921,10 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.6"
   source_span:
     dependency: transitive
     description:

moneymgr_mobile/pubspec.yaml

@@ -52,7 +52,7 @@ dependencies:
   flutter_hooks: ^0.21.2
 
   # Router
-  go_router: ^15.2.4
+  go_router: ^16.0.0
 
   # Flutter extras widgets for columns and rows
   flextras: ^1.0.0
@@ -72,6 +72,7 @@ dependencies:
 
   # API requests
   dio: ^5.8.0+1
+  http_parser: ^4.1.2
 
   # Qr Code library
   mobile_scanner: ^7.0.1
@@ -89,8 +90,8 @@ dependencies:
   path_provider: ^2.1.5
   path: ^1.9.1
 
-  # PDF viewer
+  # PDF renderer
-  flutter_pdfview: ^1.4.1+1
+  pdf_image_renderer: ^1.0.1
 
 dev_dependencies:
   flutter_test:
@@ -101,7 +102,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
 
   # Manage app icon
   flutter_launcher_icons: ^0.14.4
@@ -126,6 +127,9 @@ dev_dependencies:
 # The following section is specific to Flutter packages.
 flutter:
 
+  # Default Android flavor
+  default-flavor: development
+
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.

moneymgr_web/package-lock.json

@@ -9,28 +9,28 @@
       "version": "0.0.0",
       "dependencies": {
         "@emotion/react": "^11.14.0",
-        "@emotion/styled": "^11.14.0",
+        "@emotion/styled": "^11.14.1",
         "@fontsource/roboto": "^5.2.6",
         "@jsonjoy.com/base64": "^1.1.2",
         "@mdi/js": "^7.4.47",
         "@mdi/react": "^1.6.1",
         "@mui/icons-material": "^7.1.2",
         "@mui/material": "^7.1.2",
-        "@mui/x-charts": "^8.5.3",
+        "@mui/x-charts": "^8.8.0",
-        "@mui/x-data-grid": "^8.5.3",
+        "@mui/x-data-grid": "^8.8.0",
-        "@mui/x-date-pickers": "^8.5.3",
+        "@mui/x-date-pickers": "^8.8.0",
         "date-and-time": "^3.6.0",
         "dayjs": "^1.11.13",
         "filesize": "^10.1.6",
         "qrcode.react": "^4.2.0",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
-        "react-router": "^7.6.2",
+        "react-router": "^7.6.3",
-        "react-router-dom": "^7.6.2",
+        "react-router-dom": "^7.6.3",
         "ts-pattern": "^5.7.1"
       },
       "devDependencies": {
-        "@eslint/js": "^9.29.0",
+        "@eslint/js": "^9.31.0",
         "@types/react": "^19.1.8",
         "@types/react-dom": "^19.1.6",
         "@vitejs/plugin-react": "^4.6.0",
@@ -38,8 +38,8 @@
         "eslint-plugin-react-dom": "^1.49.0",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^00.4.20",
-        "eslint-plugin-react-x": "^1.52.2",
+        "eslint-plugin-react-x": "^1.52.3",
-        "globals": "^16.2.0",
+        "globals": "^16.3.0",
         "typescript": "~5.8.3",
         "typescript-eslint": "^8.32.1",
         "vite": "^6.3.5"
@@ -444,9 +444,9 @@
       "license": "MIT"
     },
     "node_modules/@emotion/styled": {
-      "version": "11.14.0",
+      "version": "11.14.1",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
-      "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==",
+      "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -1145,9 +1145,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.29.0",
+      "version": "9.31.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
-      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1544,12 +1544,12 @@
       }
     },
     "node_modules/@mui/types": {
-      "version": "7.4.3",
+      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.4.tgz",
-      "integrity": "sha512-2UCEiK29vtiZTeLdS2d4GndBKacVyxGvReznGXGr+CzW/YhjIX+OHUdCIczZjzcRAgKBGmE9zCIgoV9FleuyRQ==",
+      "integrity": "sha512-p63yhbX52MO/ajXC7hDHJA5yjzJekvWD3q4YDLl1rSg+OXLczMYPvTuSuviPRCgRX8+E42RXz1D/dz9SxPSlWg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.1"
+        "@babel/runtime": "^7.27.6"
       },
       "peerDependencies": {
         "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1561,14 +1561,14 @@
       }
     },
     "node_modules/@mui/utils": {
-      "version": "7.1.1",
+      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.2.0.tgz",
-      "integrity": "sha512-BkOt2q7MBYl7pweY2JWwfrlahhp+uGLR8S+EhiyRaofeRYUWL2YKbSGQvN4hgSN1i8poN0PaUiii1kEMrchvzg==",
+      "integrity": "sha512-O0i1GQL6MDzhKdy9iAu5Yr0Sz1wZjROH1o3aoztuivdCXqEeQYnEjTDiRLGuFxI9zrUbTHBwobMyQH5sNtyacw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.27.1",
+        "@babel/runtime": "^7.27.6",
-        "@mui/types": "^7.4.3",
+        "@mui/types": "^7.4.4",
-        "@types/prop-types": "^15.7.14",
+        "@types/prop-types": "^15.7.15",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
         "react-is": "^19.1.0"
@@ -1591,15 +1591,16 @@
       }
     },
     "node_modules/@mui/x-charts": {
-      "version": "8.5.3",
+      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.8.0.tgz",
-      "integrity": "sha512-aLU3KNA5bfKufxCPxBYx34xOn1mY5xaYGxxImEIQhL1BDnsjdkeF7b7gitL62XHpJe7ceU0nr2PbAr8msU0ZBQ==",
+      "integrity": "sha512-tqdwKoUpo8u+KZdEWO4C21Q0P3HOL/DadAZSMmTdtO1LDCO/m4S8UtHFpj2B0pZuikdiBJ5bz49I+nfBfK1Xng==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
+        "@mui/utils": "^7.2.0",
         "@mui/x-charts-vendor": "8.5.3",
-        "@mui/x-internals": "8.5.3",
+        "@mui/x-internal-gestures": "0.2.1",
+        "@mui/x-internals": "8.8.0",
         "bezier-easing": "^2.1.0",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
@@ -1652,14 +1653,14 @@
       }
     },
     "node_modules/@mui/x-data-grid": {
-      "version": "8.5.3",
+      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-8.8.0.tgz",
-      "integrity": "sha512-rA+de5yre16KFIGKRBUwb8kYIdn7SPPrZsBy1P3QxisqhC+Wz2AQg/W6WWv71aFHwplmGwsFUjU6d47Fy/wvXg==",
+      "integrity": "sha512-xWoBmxHi5JvT0QvAYGYJYNy4DEi+Lez+lrsqw3YV7z0jEYyJoV9vjFCiFE4QmG6IPg62B1gZHYE5AkDLFCvPkw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
+        "@mui/utils": "^7.2.0",
-        "@mui/x-internals": "8.5.3",
+        "@mui/x-internals": "8.8.0",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
         "use-sync-external-store": "^1.5.0"
@@ -1689,14 +1690,14 @@
       }
     },
     "node_modules/@mui/x-date-pickers": {
-      "version": "8.5.3",
+      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-8.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-8.8.0.tgz",
-      "integrity": "sha512-rToJOgIfVN/mG8QPX5RSPcP7QdnNN4yk+37fBztVUnmR7mhiWdUNSHlazGpnRGRqDdr4lXRkJbTjtJLviWkhKg==",
+      "integrity": "sha512-Rlk1wgkNHjMf22Ejv6jB+XueFYZmiwMYlJz3oRw9d8HhnshtMVjJbSNOI9yZ2wtqyEr0CGfryCnryywHpmfzeA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
+        "@mui/utils": "^7.2.0",
-        "@mui/x-internals": "8.5.3",
+        "@mui/x-internals": "8.8.0",
         "@types/react-transition-group": "^4.4.12",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
@@ -1754,14 +1755,23 @@
         }
       }
     },
+    "node_modules/@mui/x-internal-gestures": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@mui/x-internal-gestures/-/x-internal-gestures-0.2.1.tgz",
+      "integrity": "sha512-7Po6F4/RdUrFyRwiwvh5ZNeY/bi8wavTCUe+stKAyMliKpgcYiEtH7ywTgroOEq0o56fIpyPzwC4+bbGwYFnvA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.27.6"
+      }
+    },
     "node_modules/@mui/x-internals": {
-      "version": "8.5.3",
+      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.8.0.tgz",
-      "integrity": "sha512-ImCg4E3DT3XoDIZO0pNCbB7iw14N+YCFY3J1V28POwCD7P2f3HSIz4jwzM006oYxI6bqeE6LMfpdPRDW6s6dQw==",
+      "integrity": "sha512-qTRK5oINkAjZ7sIHpSnESLNq1xtQUmmfmGscYUSEP0uHoYh6pKkNWH9+7yzggRHuTv+4011VBwN9s+efrk+xZg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.27.6",
-        "@mui/utils": "^7.1.1",
+        "@mui/utils": "^7.2.0",
         "reselect": "^5.1.1"
       },
       "engines": {
@@ -2234,9 +2244,9 @@
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.14",
+      "version": "15.7.15",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
       "license": "MIT"
     },
     "node_modules/@types/react": {
@@ -2333,14 +2343,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.35.0",
+        "@typescript-eslint/types": "^8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2355,9 +2365,9 @@
       }
     },
     "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2387,9 +2397,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3487,29 +3497,28 @@
       }
     },
     "node_modules/eslint-plugin-react-x": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-x/-/eslint-plugin-react-x-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-x/-/eslint-plugin-react-x-1.52.3.tgz",
-      "integrity": "sha512-Pxpf3YxCUcNgzJVT6blAJ2KvLX32pUxtXndaCZoTdiytFw/H9OZKq4Qczxx/Lpo9Ri5rm4FbIZL3BfL/HGmzBw==",
+      "integrity": "sha512-Sds4CXHtdgaCdzoypcY3DSshS0JtK2Eh+QbpUAPUqs0UWQ3qtQKxY0nntTSYeF+GXDfOdAYDkl/8+VFpHQwIKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/ast": "1.52.2",
+        "@eslint-react/ast": "1.52.3",
-        "@eslint-react/core": "1.52.2",
+        "@eslint-react/core": "1.52.3",
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@eslint-react/kit": "1.52.2",
+        "@eslint-react/kit": "1.52.3",
-        "@eslint-react/shared": "1.52.2",
+        "@eslint-react/shared": "1.52.3",
-        "@eslint-react/var": "1.52.2",
+        "@eslint-react/var": "1.52.3",
-        "@typescript-eslint/scope-manager": "^8.34.0",
+        "@typescript-eslint/scope-manager": "^8.36.0",
-        "@typescript-eslint/type-utils": "^8.34.0",
+        "@typescript-eslint/type-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.34.0",
+        "@typescript-eslint/types": "^8.36.0",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "compare-versions": "^6.1.1",
         "is-immutable-type": "^5.0.1",
         "string-ts": "^2.2.1",
         "ts-pattern": "^5.7.1"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       },
       "peerDependencies": {
@@ -3530,123 +3539,117 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/ast": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/ast/-/ast-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/ast/-/ast-1.52.3.tgz",
-      "integrity": "sha512-L0Tbbzx5l7JHgkQ1TqPWQuZ4+PsXDcgtt3056FOYqstUrDRG+5ylm7h3gEWu98I3FDdgLS8q9dOzz0PGgwZCTA==",
+      "integrity": "sha512-71afQeBz0t5FqxLPfOgfQy2703t4T4tM5ooF/swIfUljCQxrFvIYivzYU67wrwLSnmkSfFJKp99bUCz7L3IP4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@typescript-eslint/types": "^8.34.0",
+        "@typescript-eslint/types": "^8.36.0",
-        "@typescript-eslint/typescript-estree": "^8.34.0",
+        "@typescript-eslint/typescript-estree": "^8.36.0",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "string-ts": "^2.2.1",
         "ts-pattern": "^5.7.1"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/core": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/core/-/core-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/core/-/core-1.52.3.tgz",
-      "integrity": "sha512-FpxKZJHlf3zXETNL+WQP/SoYuVQNheWm1iDgW68RyHygD8mzk9CnVLDgjMrfmh2n0eaOqnWCL/IC2YzD6VpYOQ==",
+      "integrity": "sha512-N/fY3q1V0F81OzKGn0ZopmHY+OQHYQiS49MvpSWhNciL+TDxOo4CSt+wayMz5/9G/B/PwGB68eprjow0AaTYzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/ast": "1.52.2",
+        "@eslint-react/ast": "1.52.3",
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@eslint-react/kit": "1.52.2",
+        "@eslint-react/kit": "1.52.3",
-        "@eslint-react/shared": "1.52.2",
+        "@eslint-react/shared": "1.52.3",
-        "@eslint-react/var": "1.52.2",
+        "@eslint-react/var": "1.52.3",
-        "@typescript-eslint/scope-manager": "^8.34.0",
+        "@typescript-eslint/scope-manager": "^8.36.0",
-        "@typescript-eslint/type-utils": "^8.34.0",
+        "@typescript-eslint/type-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.34.0",
+        "@typescript-eslint/types": "^8.36.0",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "birecord": "^0.1.1",
         "ts-pattern": "^5.7.1"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/eff": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/eff/-/eff-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/eff/-/eff-1.52.3.tgz",
-      "integrity": "sha512-YBPE2J1+PfXrR9Ct+9rQsw8uRU06zHopI508cfj0usaIBf3hz18V2GoRTVhsjniP0QbvKQdHzyPmmS/B6uyMZQ==",
+      "integrity": "sha512-CU07yUuHrrBbb8C82via3GrAXkSMbcpxd6f18f/jjEmMAXzKbN2yq1t0GfG7iwIyZexDZ7R3QBa9ksk6iwtDAA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/kit": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/kit/-/kit-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/kit/-/kit-1.52.3.tgz",
-      "integrity": "sha512-k0cSgFnPlDPI1xyRzHjEWIapLG0zCy7mx1HBLg5wuKf/zzSh3iNFId53xMebR05vM2k9YH63gsvTwRkGx/77Zw==",
+      "integrity": "sha512-IOsfaRSih7VdL9ZDjuqc7kjOlHOQOaK6hkSENK64dUcvcl6YwHk8/JXfV/glHTp3JxXrPSazBrnZKNXk0DzjKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "ts-pattern": "^5.7.1",
-        "zod": "^3.25.63"
+        "zod": "^4.0.5"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/shared": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/shared/-/shared-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/shared/-/shared-1.52.3.tgz",
-      "integrity": "sha512-YHysVcCfmBoxt2+6Ao4HdLPUYNSem70gy+0yzOQvlQFSsGhh+uifQ68SSa/2uJBWfNUm9xQlyDsr2raeO4BlgA==",
+      "integrity": "sha512-+0/2SOkNxLKBtYVLx/BCNo5xTn+dxkzP6C63gQ2ehNudMAt3zf2DouD62cHSSbl+eSAgc0zWYg8ssm5ksLN4xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@eslint-react/kit": "1.52.2",
+        "@eslint-react/kit": "1.52.3",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "ts-pattern": "^5.7.1",
-        "zod": "^3.25.63"
+        "zod": "^4.0.5"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@eslint-react/var": {
-      "version": "1.52.2",
+      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/@eslint-react/var/-/var-1.52.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-react/var/-/var-1.52.3.tgz",
-      "integrity": "sha512-/7IYMPsmO0tIYqkqAVnkqB4eXeVBvgBL/a9hcGCO2eUSzslYzQHSzNPhIoPLD9HXng+0CWlT+KupOFIqP9a26A==",
+      "integrity": "sha512-i2dfgoH93MHJNXqzS0vYIIpI2e6djIfzdnpMRHUyBYjTHFSPapE7RhcHFrAVPUrd85cUxIPW3pkTKAhkhUhYeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-react/ast": "1.52.2",
+        "@eslint-react/ast": "1.52.3",
-        "@eslint-react/eff": "1.52.2",
+        "@eslint-react/eff": "1.52.3",
-        "@typescript-eslint/scope-manager": "^8.34.0",
+        "@typescript-eslint/scope-manager": "^8.36.0",
-        "@typescript-eslint/types": "^8.34.0",
+        "@typescript-eslint/types": "^8.36.0",
-        "@typescript-eslint/utils": "^8.34.0",
+        "@typescript-eslint/utils": "^8.36.0",
         "string-ts": "^2.2.1",
         "ts-pattern": "^5.7.1"
       },
       "engines": {
-        "bun": ">=1.0.15",
         "node": ">=18.18.0"
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
+        "@typescript-eslint/visitor-keys": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3657,14 +3660,14 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
-      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
+      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/utils": "8.36.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -3681,9 +3684,9 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3695,16 +3698,16 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3724,16 +3727,16 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
+        "@typescript-eslint/typescript-estree": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3748,13 +3751,13 @@
       }
     },
     "node_modules/eslint-plugin-react-x/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
+      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.36.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -3804,6 +3807,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/eslint-plugin-react-x/node_modules/zod": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.0.5.tgz",
+      "integrity": "sha512-/5UuuRPStvHXu7RS+gmvRf4NXrNxpSllGwDnCBcJZtQsKrviYXm54yDGV2KYNLT5kq0lHGcl7lqWJLgSaG+tgA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
@@ -4265,9 +4278,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
+      "version": "16.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5210,9 +5223,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.6.2",
+      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.3.tgz",
-      "integrity": "sha512-U7Nv3y+bMimgWjhlT5CRdzHPu2/KVmqPwKUCChW8en5P3znxUqwlYFlbmyj8Rgp1SF6zs5X4+77kBVknkg6a0w==",
+      "integrity": "sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -5232,12 +5245,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.6.2",
+      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.3.tgz",
-      "integrity": "sha512-Q8zb6VlTbdYKK5JJBLQEN06oTUa/RAbG/oQS1auK1I0TbJOXktqm+QENEVJU6QvWynlXPRBXI3fiOQcSEA78rA==",
+      "integrity": "sha512-DiWJm9qdUAmiJrVWaeJdu4TKu13+iB/8IEi0EW/XgaHCjW/vWGrwzup0GVvaMteuZjKnh5bEvJP/K0MDnzawHw==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.6.2"
+        "react-router": "7.6.3"
       },
       "engines": {
         "node": ">=20.0.0"

moneymgr_web/package.json

@@ -11,28 +11,28 @@
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@fontsource/roboto": "^5.2.6",
     "@jsonjoy.com/base64": "^1.1.2",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
     "@mui/icons-material": "^7.1.2",
     "@mui/material": "^7.1.2",
-    "@mui/x-charts": "^8.5.3",
+    "@mui/x-charts": "^8.8.0",
-    "@mui/x-data-grid": "^8.5.3",
+    "@mui/x-data-grid": "^8.8.0",
-    "@mui/x-date-pickers": "^8.5.3",
+    "@mui/x-date-pickers": "^8.8.0",
     "date-and-time": "^3.6.0",
     "dayjs": "^1.11.13",
     "filesize": "^10.1.6",
     "qrcode.react": "^4.2.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "react-router": "^7.6.2",
+    "react-router": "^7.6.3",
-    "react-router-dom": "^7.6.2",
+    "react-router-dom": "^7.6.3",
     "ts-pattern": "^5.7.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^9.31.0",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
@@ -40,8 +40,8 @@
     "eslint-plugin-react-dom": "^1.49.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^00.4.20",
-    "eslint-plugin-react-x": "^1.52.2",
+    "eslint-plugin-react-x": "^1.52.3",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.32.1",
     "vite": "^6.3.5"

moneymgr_web/src/routes/AccountRoute.tsx

@@ -2,9 +2,11 @@ import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 import DriveFileMoveOutlineIcon from "@mui/icons-material/DriveFileMoveOutline";
 import LinkOffIcon from "@mui/icons-material/LinkOff";
 import MoreVertIcon from "@mui/icons-material/MoreVert";
+import ClearIcon from "@mui/icons-material/Clear";
 import RefreshIcon from "@mui/icons-material/Refresh";
 import {
   IconButton,
+  InputAdornment,
   ListItemIcon,
   ListItemText,
   TextField,
@@ -392,6 +394,19 @@ function MovementsTable(p: {
             setFilter(e.target.value);
           }}
           style={{ padding: "0px", flex: 1 }}
+          slotProps={{
+            input: {
+              endAdornment: filter.length > 0 && (
+                <InputAdornment position="end">
+                  <Tooltip title="Clear current filter">
+                    <IconButton size="small" onClick={() => { setFilter(""); }}>
+                      <ClearIcon />
+                    </IconButton>
+                  </Tooltip>
+                </InputAdornment>
+              ),
+            },
+          }}
         />
         <span style={{ flex: 1 }}></span>
         <Tooltip title="Refresh table">