CSV import

lib/ui/settings/device_settings_list.dart

@@ -31,17 +31,11 @@ class _DeviceSettingsState extends State<DeviceSettings> {
     final state = viewModel.state;
     final prefState = state.prefState;
 
-    return WillPopScope(
-      onWillPop: () async {
-        //viewModel.onBackPressed();
-        return true;
-      },
-      child: Scaffold(
+    return Scaffold(
       appBar: AppBar(
         centerTitle: false,
         automaticallyImplyLeading: isMobile(context),
         title: Text(localization.deviceSettings),
-          actions: <Widget>[],
       ),
       body: Form(
         key: _formKey,
@@ -202,7 +196,6 @@ class _DeviceSettingsState extends State<DeviceSettings> {
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/ui/settings/import_export.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/ui/settings/import_export_vm.dart';
-import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ImportExport extends StatefulWidget {
   const ImportExport({
@@ -59,9 +59,13 @@ class _ImportExportState extends State<ImportExport> {
     final localization = AppLocalization.of(context);
     //final viewModel = widget.viewModel;
 
-    return EditScaffold(
-      title: localization.importExport,
-      onSavePressed: null,
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        automaticallyImplyLeading: isMobile(context),
+        title: Text(localization.importExport),
+        actions: <Widget>[],
+      ),
       body: SizedBox(),
     );
   }