From 6dee2980ed0e6d0d3070787792b99c3b4f5f1d45 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Thu, 13 Jul 2017 15:47:01 +0300
Subject: [PATCH 1/2] EditListingPhotosForm: submit should be disabled when
 image upload is happening

---
 .../EditListingPhotosForm/EditListingPhotosForm.js | 14 ++++++++++++--
 .../EditListingPhotosForm.test.js.snap             |  1 +
 src/translations/en.json                           |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/containers/EditListingPhotosForm/EditListingPhotosForm.js b/src/containers/EditListingPhotosForm/EditListingPhotosForm.js
index e91d7f2b..449b081b 100644
--- a/src/containers/EditListingPhotosForm/EditListingPhotosForm.js
+++ b/src/containers/EditListingPhotosForm/EditListingPhotosForm.js
@@ -43,6 +43,7 @@ RenderAddImage.propTypes = {
 export class EditListingPhotosFormComponent extends Component {
   constructor(props) {
     super(props);
+    this.state = { imageUploadRequested: false };
     this.onImageUploadHandler = this.onImageUploadHandler.bind(this);
     this.onSortEnd = this.onSortEnd.bind(this);
   }
@@ -56,7 +57,14 @@ export class EditListingPhotosFormComponent extends Component {
   onImageUploadHandler(event) {
     const file = event.target.files[0];
     if (file) {
-      this.props.onImageUpload({ id: `${file.name}_${Date.now()}`, file });
+      this.setState({ imageUploadRequested: true });
+      this.props.onImageUpload({ id: `${file.name}_${Date.now()}`, file })
+        .then(() => {
+          this.setState({ imageUploadRequested: false });
+        })
+        .catch(() => {
+          this.setState({ imageUploadRequested: false });
+        });
     }
   }
 
@@ -117,6 +125,8 @@ export class EditListingPhotosFormComponent extends Component {
 
     const classes = classNames(css.root, className);
 
+    const disableForm = invalid || submitting || disabled || this.state.imageUploadRequested;
+
     return (
       <form className={classes} onSubmit={handleSubmit}>
 
@@ -157,7 +167,7 @@ export class EditListingPhotosFormComponent extends Component {
         <Button
           className={css.submitButton}
           type="submit"
-          disabled={invalid || submitting || disabled}
+          disabled={disableForm}
         >
           {saveActionMsg}
         </Button>
diff --git a/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap b/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
index e4676034..b99080b0 100644
--- a/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
+++ b/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
@@ -44,6 +44,7 @@ exports[`EditListingPhotosForm matches snapshot 1`] = `
   </p>
   <Button
     className={null}
+    disabled={false}
     rootClassName={null}
     type="submit">
     Publish listing
diff --git a/src/translations/en.json b/src/translations/en.json
index 5ab22c09..2fcb8c37 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1,5 +1,5 @@
 {
-  "AddImages.upload": "Upload",
+  "AddImages.upload": "Uploading",
   "AddImages.couldNotReadFile": "Could not read file",
   "AuthenticationPage.emailAlreadyInUse": "An account already exists with this email address. Try logging in instead.",
   "AuthenticationPage.loginFailed": "The email and password you entered did not match our records. Please double-check and try again.",
@@ -64,7 +64,7 @@
   "EditListingPhotosForm.addImagesTip": "Tip: Choose 2-3 best photos of your sauna from different angles in a good light that really show the space.",
   "EditListingPhotosForm.bankAccountNumberRequired": "You need to add a bank account number.",
   "EditListingPhotosForm.chooseImage": "+ Choose an image…",
-  "EditListingPhotosForm.createListingFailed": "reating a new sauna failed",
+  "EditListingPhotosForm.createListingFailed": "Creating a new sauna failed",
   "EditListingPhotosForm.imageRequired": "You need to add at least one image.",
   "EditListingPhotosForm.imageTypes": ".JPG, .GIF or .PNG max. 10 MB",
   "EditListingPhotosForm.imageUploadFailed.uploadOverLimit": " Image was too big. Maximum size is 10 MB.",

From e4ff07773cc256303243b1ab03c3347df31ccb1f Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Thu, 13 Jul 2017 15:56:49 +0300
Subject: [PATCH 2/2] Notifications fetched again after accept and reject

---
 src/containers/SalePage/SalePage.duck.js | 3 +++
 src/ducks/user.duck.js                   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/containers/SalePage/SalePage.duck.js b/src/containers/SalePage/SalePage.duck.js
index 7fa2ce89..16088bb0 100644
--- a/src/containers/SalePage/SalePage.duck.js
+++ b/src/containers/SalePage/SalePage.duck.js
@@ -1,5 +1,6 @@
 import { types } from '../../util/sdkLoader';
 import { addMarketplaceEntities } from '../../ducks/marketplaceData.duck';
+import { fetchCurrentUserNotifications } from '../../ducks/user.duck';
 
 // Transition-to keys
 const TRANSITION_ACCEPT = 'transition/accept';
@@ -106,6 +107,7 @@ export const acceptSale = id =>
       .then(response => {
         dispatch(addMarketplaceEntities(response));
         dispatch(acceptSaleSuccess());
+        dispatch(fetchCurrentUserNotifications());
         return response;
       })
       .catch(e => {
@@ -123,6 +125,7 @@ export const rejectSale = id =>
       .then(response => {
         dispatch(addMarketplaceEntities(response));
         dispatch(rejectSaleSuccess());
+        dispatch(fetchCurrentUserNotifications());
         return response;
       })
       .catch(e => {
diff --git a/src/ducks/user.duck.js b/src/ducks/user.duck.js
index 84d8b372..e1048b4e 100644
--- a/src/ducks/user.duck.js
+++ b/src/ducks/user.duck.js
@@ -183,7 +183,7 @@ export const fetchCurrentUserHasListings = () =>
 // Notificaiton page size is max (100 items on page)
 const NOTIFICATION_PAGE_SIZE = 100;
 
-export const fetchCurrentUserHasNotifications = () =>
+export const fetchCurrentUserNotifications = () =>
   (dispatch, getState, sdk) => {
     dispatch(fetchCurrentUserNotificationsRequest());
 
@@ -223,7 +223,7 @@ export const fetchCurrentUser = () =>
       })
       .then(() => {
         dispatch(fetchCurrentUserHasListings());
-        dispatch(fetchCurrentUserHasNotifications());
+        dispatch(fetchCurrentUserNotifications());
       })
       .catch(e => {
         // TODO: dispatch flash message