Merge branch 'develop'

invoiceninja · Apr 11, 2024 · ed82d5f · ed82d5f
2 parents ec7b46e + 5bccbc4
commit ed82d5f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 63 deletions.
diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart
@@ -67,8 +67,6 @@ AppState appReducer(AppState state, dynamic action) {
   return state.rebuild((b) => b
     ..isLoading = loadingReducer(state.isLoading, action)
     ..isSaving = savingReducer(state.isSaving, action)
-    ..dismissedFlutterWebWarning = dismissedFlutterWebWarningReducer(
-        state.dismissedFlutterWebWarning, action)
     ..lastError = lastErrorReducer(state.lastError, action)
     ..authState.replace(authReducer(state.authState, action))
     ..staticState.replace(staticReducer(state.staticState, action))
@@ -165,12 +163,3 @@ final lastErrorReducer = combineReducers<String>([
     return '${action.error}';
   }),
 ]);
-
-final dismissedFlutterWebWarningReducer = combineReducers<bool>([
-  TypedReducer<bool, DismissFlutterWebWarning>((state, action) {
-    return true;
-  }),
-  TypedReducer<bool, DismissFlutterWebWarningPermanently>((state, action) {
-    return true;
-  }),
-]);
diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
@@ -93,7 +93,6 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
       isSaving: false,
       isTesting: false,
       isWhiteLabeled: isWhiteLabeled,
-      dismissedFlutterWebWarning: false,
       lastError: '',
       authState: AuthState(
         url: url,
@@ -126,8 +125,6 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
 
   bool get isWhiteLabeled;
 
-  bool get dismissedFlutterWebWarning;
-
   String get lastError;
 
   AuthState get authState;

diff --git a/lib/redux/app/app_state.g.dart b/lib/redux/app/app_state.g.dart
diff --git a/lib/ui/app/important_message_banner.dart b/lib/ui/app/important_message_banner.dart
@@ -42,20 +42,22 @@ class _ImportantMessageBannerState extends State<ImportantMessageBanner> {
   @override
   Widget build(BuildContext context) {
     final store = StoreProvider.of<AppState>(context);
+    final state = store.state;
     final localization = AppLocalization.of(context)!;
 
     final calculatedLayout = calculateLayout(context);
     String? message;
     String? messageType;
 
     if (!_dismissedMessage.containsKey(MESSAGE_TYPE_FLUTTER_WEB)) {
-      if (kIsWeb || !kReleaseMode) {
+      if ((kIsWeb && !state.prefState.hideFlutterWebWarning) || !kReleaseMode) {
         //message = localization.flutterWebWarning;
         //messageType = MESSAGE_TYPE_FLUTTER_WEB;
       }
     }
 
-    if (!_dismissedMessage.containsKey(MESSAGE_TYPE_LAYOUT)) {
+    if (message == null &&
+        !_dismissedMessage.containsKey(MESSAGE_TYPE_LAYOUT)) {
       if (widget.appLayout == AppLayout.mobile &&
           widget.suggestedLayout == AppLayout.mobile &&
           calculatedLayout == AppLayout.desktop) {
@@ -98,27 +100,28 @@ class _ImportantMessageBannerState extends State<ImportantMessageBanner> {
                         setState(() => _dismissedMessage[messageType!] = true);
                       },
                     ),
-                    AppTextButton(
-                      label: localization.change,
-                      color: Colors.white,
-                      onPressed: () {
-                        final layout =
-                            widget.suggestedLayout == AppLayout.desktop
-                                ? AppLayout.mobile
-                                : AppLayout.desktop;
-                        store
-                            .dispatch(UpdateUserPreferences(appLayout: layout));
-                        AppBuilder.of(context)!.rebuild();
-                        WidgetsBinding.instance
-                            .addPostFrameCallback((duration) {
-                          if (layout == AppLayout.mobile) {
-                            store.dispatch(ViewDashboard());
-                          } else {
-                            store.dispatch(ViewMainScreen(addDelay: true));
-                          }
-                        });
-                      },
-                    ),
+                    if (messageType == MESSAGE_TYPE_LAYOUT)
+                      AppTextButton(
+                        label: localization.change,
+                        color: Colors.white,
+                        onPressed: () {
+                          final layout =
+                              widget.suggestedLayout == AppLayout.desktop
+                                  ? AppLayout.mobile
+                                  : AppLayout.desktop;
+                          store.dispatch(
+                              UpdateUserPreferences(appLayout: layout));
+                          AppBuilder.of(context)!.rebuild();
+                          WidgetsBinding.instance
+                              .addPostFrameCallback((duration) {
+                            if (layout == AppLayout.mobile) {
+                              store.dispatch(ViewDashboard());
+                            } else {
+                              store.dispatch(ViewMainScreen(addDelay: true));
+                            }
+                          });
+                        },
+                      ),
                   ],
                 ),
               ),

diff --git a/lib/ui/invoice/edit/invoice_edit_desktop.dart b/lib/ui/invoice/edit/invoice_edit_desktop.dart
@@ -270,7 +270,7 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
           Flexible(
             flex: 3,
             child: Column(
-              key: ValueKey('__invoice_${invoice.id}_${invoice.updatedAt}__'),
+              key: ValueKey('__invoice_${invoice.id}__'),
               children: <Widget>[
                 Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -456,7 +456,8 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                               },
                             ),
                             DatePicker(
-                              key: ValueKey('__terms_${client.id}__'),
+                              key: ValueKey(
+                                  '__due_date_${client.id}_${invoice.updatedAt}__'),
                               labelText: entityType == EntityType.invoice ||
                                       entityType == EntityType.purchaseOrder
                                   ? localization.dueDate