muba-posting 8.0.16 → 8.0.17

package/Posting.js

@@ -230,11 +230,13 @@ export default class Posting extends React.Component {
           this.popupNoListings.show();
         } else {
           const pendingAd = await this.props.request(this.props.context, LOAD_PENDING_CREATED, { businessId: this.state.businessId });
+          
           if (pendingAd.httpStatus === 200) {
             delete pendingAd.phones;
             const languages = pendingAd?.languages.length > 0 ? pendingAd?.languages : this.state.postingAd.languages
             const languageId = languages[0].language;
-            await this.setState({
+            
+            this.setState({
               postingAd: { ...this.state.postingAd, ...pendingAd, languageId: languageId, languages: languages },
               originalAd: { ...this.state.postingAd, ...pendingAd, languageId: languageId, languages: languages }
             });
@@ -327,7 +329,7 @@ export default class Posting extends React.Component {
     if (bddAd.status === 'PENDING_CREATED') {
       const languages = bddAd?.languages.length > 0 ? bddAd?.languages : this.state.postingAd.languages
       const languageId = languages[0].language;
-      await this.setState({
+      this.setState({
         postingAd: { ...this.state.postingAd, ...bddAd, languageId: languageId, languages: languages },
         originalAd: { ...this.state.postingAd, ...bddAd, languageId: languageId, languages: languages },
         adId: null,
@@ -335,7 +337,7 @@ export default class Posting extends React.Component {
         fullPosting: true
       })
     } else {
-      await this.setState({
+      this.setState({
         postingAd: { ...this.state.postingAd, ...bddAd },
         originalAd: { ...this.state.postingAd, ...bddAd }
       });
@@ -369,57 +371,71 @@ export default class Posting extends React.Component {
       }
     }
 
-    this.setState({ prevViews: prevViews, editingStepOne: editingStepOne });
-    await this._updateCurrentScreen(view, params);
+    this.setState({ prevViews: prevViews, editingStepOne: editingStepOne }, () => {
+      this._updateCurrentScreen(view, params);
+    });
   }
 
-  async _updateCurrentScreen(view, params) {
+  _updateCurrentScreen(view, params) {
+    let currentScreen = this.state.currentScreen;
+    let prevViews = this.state.prevViews;
+    let onlyShowCreateBusiness = this.state.onlyShowCreateBusiness;
+    let newParams = this.state.params;
+
     switch (view) {
       case Views.PUBLISH_1:
-        this.setState({ currentScreen: 1 });
+        currentScreen = 1;
         break;
       case Views.PUBLISH_2:
         if (this.state.locationList.length === 0) {
           this.loadLocations();
         }
-        this.setState({ currentScreen: 2 });
+        currentScreen = 2;
         break;
       case Views.PUBLISH_2_B:
-        this.setState({ currentScreen: 2 });
+        currentScreen = 2;
         break;
       case Views.PUBLISH_3:
-        this.setState({ currentScreen: 3 });
+        currentScreen = 3;
         break;
       case Views.PUBLISH_4:
-        this.setState({ currentScreen: 4 });
+        currentScreen = 4;
         break;
       case Views.PUBLISH_5:
-        this.setState({ currentScreen: 5 });
+        currentScreen = 5;
         break;
       case Views.PUBLISH_6:
-        this.setState({ currentScreen: 6 });
+        currentScreen = 6;
         break;
       case Views.PREVIEW:
         if (params) {
-          this.setState({ params: params });
+          newParams = params;
         }
-        this.setState({ prevViews: [] })
+        prevViews = [];
         break;
       case Views.EDIT_SELECTOR:
-        this.setState({ prevViews: [] })
+        prevViews = [];
         break;
       case Views.PAYMENT_ONLINE:
         if (params) {
-          this.setState({ onlyShowCreateBusiness: params.onlyShowCreateBusiness});
+          onlyShowCreateBusiness = params.onlyShowCreateBusiness;
         } else {
-          this.setState({ onlyShowCreateBusiness: false});
+          onlyShowCreateBusiness = false;
         }
     }
-    this.scroll.scrollTop();
-    this.setState({ view: view });
-    if (this.props.changeView && Views.PAYMENT_ONLINE !== view) {
-      this.props.changeView(view);
-    }
+    
+    this.setState({ 
+      view: view,
+      prevViews: prevViews,
+      currentScreen: currentScreen,
+      onlyShowCreateBusiness: onlyShowCreateBusiness,
+      params: newParams
+    }, () => {
+      this.scroll.scrollTop();
+      if (this.props.changeView && Views.PAYMENT_ONLINE !== view) {
+        this.props.changeView(view);
+      }      
+    });
   }
 
   goBack = async () => {
@@ -446,12 +462,13 @@ export default class Posting extends React.Component {
           originalAd = { ...this.state.originalAd };
         }
 
-        await this.setState({
+        this.setState({
           prevViews: prevViews,
           postingAd: { ...originalAd },
           originalAd: { ...originalAd }
+        }, () => {
+          this._updateCurrentScreen(view);
         });
-        this._updateCurrentScreen(view);
       }
     }
   }
@@ -479,24 +496,24 @@ export default class Posting extends React.Component {
         this.props.navigation.goBack();
       }
     } else {
-      await this.setState({
+      this.setState({
         postingAd: { ...this.state.postingAd, adId: response.id },
         originalAd: { ...this.state.postingAd, adId: response.id }
-      });
-
-      this._goToPage(Views.PREVIEW, null, response);
-      if (!showRating && this.props.showRatingPopup) {
-        const popupShowed = await this.props.showRatingPopup();
-        this.setState({
-          showRatePopup: popupShowed
-        });
-
-        if (!popupShowed) {
-          this.checkPaymentOnline();
+      }, async () => {
+        this._goToPage(Views.PREVIEW, null, response);
+        if (!showRating && this.props.showRatingPopup) {
+          const popupShowed = await this.props.showRatingPopup();
+          this.setState({
+            showRatePopup: popupShowed
+          });
+  
+          if (!popupShowed) {
+            this.checkPaymentOnline();
+          }
         }
-      }
-
-      showRating = true;
+  
+        showRating = true;
+      });
     }
     this._hideLoading();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {