Merge remote-tracking branch 'origin/repo/chore/advanced-deployment' …

…into repo/chore/advanced-deployment
jt-foss · Apr 18, 2024 · 4002187 · 4002187
2 parents 0cec4b8 + 5ee23e3
commit 4002187
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/frontend/lib/data/store.dart b/frontend/lib/data/store.dart
@@ -94,7 +94,7 @@ class KeyValueStore {
   /// by either using the [toValue] function of the key or by simply returning
   /// its toString() representation.
   String? readAsStringSync<T>(StoreKey<T> key) {
-    return _toStringOrValue<T?>(readSync(key), key);
+    return _toStringOrValue<T?>(readSync(key), key).toString();
   }
 
   /// Reads the value of the key from the local cache.
@@ -118,6 +118,10 @@ class KeyValueStore {
   Future<void> write<T>(StoreKey<T> key, T value) async {
     _checkInitialized();
     _localCache[key.key] = value;
+    // simplify enums to strings
+    if (value is Enum) {
+      return await write(key, value.name);
+    }
     final dynamic effectiveValue = _toStringOrValue<T?>(value, key);
     if (key.secure) {
       return await _storage.write(key: key.key, value: effectiveValue);
@@ -186,7 +190,11 @@ class KeyValueStore {
   }
 
   static dynamic _toStringOrValue<T>(T value, StoreKey<T> key) {
-    return key.toValue?.call(value) ?? value;
+    final dynamic d = key.toValue?.call(value) ?? value;
+    if (d is Enum) {
+      return d.name;
+    }
+    return d;
   }
 
   static T? _fromStringOrValue<T>(dynamic value, StoreKey<T> key) {

diff --git a/frontend/lib/layout/scaffold_navbar_shell.dart b/frontend/lib/layout/scaffold_navbar_shell.dart
@@ -1,4 +1,5 @@
 import 'package:financrr_frontend/util/extensions.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
@@ -65,11 +66,12 @@ class ScaffoldNavBarShellState extends State<ScaffoldNavBarShell> {
   @override
   Widget build(BuildContext context) {
     final isMobile = context.isMobile;
+    final Widget shell = kIsWeb ? SelectionArea(child: widget.navigationShell) : widget.navigationShell;
     return Scaffold(
       body: SafeArea(
         top: false,
         child: isMobile
-            ? widget.navigationShell
+            ? shell
             : Row(
                 children: [
                   StatefulBuilder(builder: (context, setState) {
@@ -84,7 +86,7 @@ class ScaffoldNavBarShellState extends State<ScaffoldNavBarShell> {
                     );
                   }),
                   Expanded(
-                    child: widget.navigationShell,
+                    child: shell,
                   )
                 ],
               ),