From 1a2afee9ffd1040db43df6ea0c918f99b8a07ea2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Jan 2021 12:12:07 +0200
Subject: [PATCH] Company documents

---
 lib/redux/settings/settings_middleware.dart | 2 +-
 lib/ui/app/edit_scaffold.dart               | 2 ++
 lib/ui/app/forms/save_cancel_buttons.dart   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/redux/settings/settings_middleware.dart b/lib/redux/settings/settings_middleware.dart
index 9432dc1dd..6587fbfd6 100644
--- a/lib/redux/settings/settings_middleware.dart
+++ b/lib/redux/settings/settings_middleware.dart
@@ -173,7 +173,7 @@ Middleware<AppState> _uploadLogo(SettingsRepository settingsRepository) {
 
 Middleware<AppState> _saveDocument(SettingsRepository repository) {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
-    final action = dynamicAction as SaveClientDocumentRequest;
+    final action = dynamicAction as SaveCompanyDocumentRequest;
     final state = store.state;
     if (state.isEnterprisePlan) {
       repository
diff --git a/lib/ui/app/edit_scaffold.dart b/lib/ui/app/edit_scaffold.dart
index 7549244ec..c9418551f 100644
--- a/lib/ui/app/edit_scaffold.dart
+++ b/lib/ui/app/edit_scaffold.dart
@@ -53,6 +53,8 @@ class EditScaffold extends StatelessWidget {
             if (isMobile(context) ||
                 !state.uiState.isInSettings ||
                 state.uiState.isEditing ||
+                state.isLoading ||
+                state.isSaving ||
                 state.settingsUIState.isChanged)
               SaveCancelButtons(
                 saveLabel: saveLabel,
diff --git a/lib/ui/app/forms/save_cancel_buttons.dart b/lib/ui/app/forms/save_cancel_buttons.dart
index 69e9192aa..91d41f588 100644
--- a/lib/ui/app/forms/save_cancel_buttons.dart
+++ b/lib/ui/app/forms/save_cancel_buttons.dart
@@ -28,7 +28,7 @@ class SaveCancelButtons extends StatelessWidget {
 
     return Row(
       children: <Widget>[
-        if (onCancelPressed != null)
+        if (onCancelPressed != null && !isSaving)
           Builder(builder: (BuildContext context) {
             return FlatButton(
               child: Text(