muba-posting 6.0.13 → 6.0.14

package/Posting.js

@@ -5,7 +5,6 @@ import { CommonActions } from '@react-navigation/native';
 import { loadLocaleData, currentLocale, strings } from 'muba-i18n';
 import { Views } from './utils/Views';
 import commonStyles from './commonStyles';
-import LoadingCursor from 'muba-loading-cursor';
 import PopupAdvice from 'muba-popup-advice';
 import OutputText from 'muba-output-text';
 import { addFontList } from 'muba-font';
@@ -35,6 +34,7 @@ const MAX_PICTURES = { method: 'GET', url: '/controller/posting/max-pictures' };
 const COUNTRY_PHONE = { method: 'GET', url: '/controller/countries/{countryCode}/phones' };
 const LOAD_PENDING_CREATED = { method: 'GET', url: '/controller/ads/pending-created/posting' };
 const PAYMENT_ONLINE_ACTIVE = { method: 'GET', url: '/controller/payments-online/{countryCode}/active' };
+const LOAD_LOCATIONS = { method: 'GET', url: '/controller/countries/{countryCode}/locations' };
 const UPLOADED_FILES_KEY = 'uploadedFiles';
 
 export default class Posting extends React.Component {
@@ -57,7 +57,6 @@ export default class Posting extends React.Component {
       prevViews: [],
       currentScreen: 1,
       fontLoaded: false,
-      isLoading: false,
       adId: this.props.adId,
       maxPictures: 0,
       countryPhone: '',
@@ -65,6 +64,7 @@ export default class Posting extends React.Component {
       realEstateDeveloper: this.props.realEstateDeveloper === true,
       picturesUploaded: 0,
       params: null,
+      locationList: [],
       postingAd: {
         transaction: null,
         adType: null,
@@ -189,8 +189,9 @@ export default class Posting extends React.Component {
   }
 
   loadData = async (canPublish) => {
+    this._showLoading()
     if (canPublish) {
-      const resultJson = await this.props.request(this, COUNTRY_PHONE);
+      const resultJson = await this.props.request(this.props.context, COUNTRY_PHONE);
       if (resultJson.httpStatus === 200) {
         this.setState({ countryPhone: resultJson.list[0].formattedPhone });
       }
@@ -207,17 +208,15 @@ export default class Posting extends React.Component {
           this.props.changeView(this.state.originView)
         }
       } else {
-        await this.setState({ isLoading: false });
         if (!hasListings) {
           this.popupNoListings.show();
         } else {
-          const pendingAd = await this.props.request(this, LOAD_PENDING_CREATED, { businessId: this.state.businessId });
+          const pendingAd = await this.props.request(this.props.context, LOAD_PENDING_CREATED, { businessId: this.state.businessId });
           if (pendingAd.httpStatus === 200) {
             const languages = pendingAd?.languages.length > 0 ? pendingAd?.languages : this.state.postingAd.languages
             const languageId = languages[0].language;
             await this.setState({
-              postingAd: { ...this.state.postingAd, ...pendingAd, languageId: languageId, languages: languages },
-              isLoading: false
+              postingAd: { ...this.state.postingAd, ...pendingAd, languageId: languageId, languages: languages }
             });
           }
 
@@ -227,10 +226,15 @@ export default class Posting extends React.Component {
           }
         }
       }
+
+      this._hideLoading()
+      this.props.request(this.props.context, LOAD_LOCATIONS, { regions: true, cities: true, districts: true, towns: true }).then(data => {
+        this.setState({ locationList: data.list });
+      });
       BackHandler.addEventListener('hardwareBackPress', this.goBack);
     } else {
       this.goBack();
-      await this.setState({ isLoading: false });
+      this._hideLoading()
     }
   }
 
@@ -253,12 +257,12 @@ export default class Posting extends React.Component {
   }
 
   async checkListings() {
-    const responseJson = await this.props.request(this, BUSINESS_PRODUCTS, { key: 'LISTING' });
+    const responseJson = await this.props.request(this.props.context, BUSINESS_PRODUCTS, { key: 'LISTING' });
     return responseJson.value > 0;
   }
 
   async readBusinessId() {
-    const responseJson = await this.props.request(this, BUSINESS_ID, { userId: this.props.userId });
+    const responseJson = await this.props.request(this.props.context, BUSINESS_ID, { userId: this.props.userId });
     if (responseJson.httpStatus === 200) {
       this.setState({
         businessId: responseJson.value,
@@ -268,7 +272,7 @@ export default class Posting extends React.Component {
   }
 
   async getMaxPictures() {
-    const responseJson = await this.props.request(this, MAX_PICTURES);
+    const responseJson = await this.props.request(this.props.context, MAX_PICTURES);
     if (responseJson.httpStatus === 200) {
       this.setState({
         maxPictures: responseJson.value
@@ -283,15 +287,13 @@ export default class Posting extends React.Component {
       const languageId = languages[0].language;
       await this.setState({
         postingAd: { ...this.state.postingAd, ...bddAd, languageId: languageId, languages: languages },
-        isLoading: false,
         adId: null,
         originView: Views.PUBLISH_1,
         fullPosting: true
       })
     } else {
       await this.setState({
-        postingAd: { ...this.state.postingAd, ...bddAd },
-        isLoading: false
+        postingAd: { ...this.state.postingAd, ...bddAd }
       });
     }
   }
@@ -306,7 +308,7 @@ export default class Posting extends React.Component {
       if (Views.PUBLISH_4 !== this.state.view) {
         delete ad.images;
       }
-      const response = await this.props.request(this, CREATE_AD, ad);
+      const response = await this.props.request(this.props.context, CREATE_AD, ad);
       if (response.httpStatus === 200) {
         let images = this.state.postingAd.images;
         if (response[UPLOADED_FILES_KEY]) {
@@ -356,34 +358,35 @@ export default class Posting extends React.Component {
     this.scroll.scrollTop();
     this.setState({ view: view });
     if (this.props.changeView && Views.PAYMENT_ONLINE !== view) {
-      this.props.changeView(view)
+      this.props.changeView(view);
+    }
+
+    if (Views.PAYMENT_ONLINE !== view) {
+      this.props.showTopBar();
+    } else {
+      this.props.hideTopBar();
     }
   }
 
   goBack = async () => {
-    if (!this.state.showImageBrowser) {
-      if (this.state.prevViews.length === 0 || this.state.view === Views.PREVIEW) {
-        this.props.navigation.dispatch(state => {
-          state.routes.splice(state.routes.length - 1, 1);
-          const routes = state.routes.map(r => { return { name: r.name } });
-
-          return CommonActions.reset({
-            routes,
-            index: routes.length - 1
-          });
+    if (this.state.prevViews.length === 0 || this.state.view === Views.PREVIEW) {
+      this.props.navigation.dispatch(state => {
+        state.routes.splice(state.routes.length - 1, 1);
+        const routes = state.routes.map(r => { return { name: r.name } });
+
+        return CommonActions.reset({
+          routes,
+          index: routes.length - 1
         });
-      } else {
-        const prevViews = [...this.state.prevViews];
+      });
+    } else {
+      const prevViews = [...this.state.prevViews];
 
-        prevViews.shift();
+      prevViews.shift();
 
-        const view = this.state.prevViews[0];
-        await this.setState({ prevViews: prevViews });
-        this._updateCurrentScreen(view);
-      }
-    } else if (this.state.showImageBrowser) {
-      await this.setState({ showImageBrowser: false })
-      this.setState({ view: Views.PUBLISH_4 })
+      const view = this.state.prevViews[0];
+      await this.setState({ prevViews: prevViews });
+      this._updateCurrentScreen(view);
     }
   }
 
@@ -393,10 +396,9 @@ export default class Posting extends React.Component {
     if (this.state.originView === Views.EDIT_SELECTOR && Views.PUBLISH_4 !== this.state.view) {
       delete ad.images;
     }
-    const response = await this.props.request(this, UPDATE_AD, ad);
+    const response = await this.props.request(this.props.context, UPDATE_AD, ad);
     if (this.props.adId) {
       if (this.state.originView === Views.EDIT_SELECTOR) {
-        this.setState({ isLoading: true });
         await this.loadAd();
         this._goToPage(Views.EDIT_SELECTOR);
       } else {
@@ -406,7 +408,7 @@ export default class Posting extends React.Component {
       await this.setState({ postingAd: { ...this.state.postingAd, adId: response.id } });
       this._goToPage(Views.PREVIEW, null, response);
 
-      const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.state.postingAd.region });
+      const paymentOnlineActive = await this.props.request(this.props.context, PAYMENT_ONLINE_ACTIVE, { regionId: this.state.postingAd.region });
       if (!this.state.businessId && paymentOnlineActive.value === 'true') {
         this._goToPage(Views.PAYMENT_ONLINE);
       }
@@ -419,12 +421,12 @@ export default class Posting extends React.Component {
   }
 
   async _showLoading() {
-    this.setState({ isLoading: true });
+    this.props.showLoading();
   }
 
   async _hideLoading() {
-    await this.sleep(500);
-    this.setState({ isLoading: false });
+    await this.sleep(300);
+    this.props.hideLoading();
   }
 
   sleep = (ms) => {
@@ -432,7 +434,7 @@ export default class Posting extends React.Component {
   }
 
   getAd = async (id) => {
-    const responseJson = await this.props.request(this, AD, {
+    const responseJson = await this.props.request(this.props.context, AD, {
       adId: id
     });
 
@@ -441,204 +443,197 @@ export default class Posting extends React.Component {
 
   render() {
     return (
-      <View style={[commonStyles.flex1, commonStyles.containerBg]}>
-        <LoadingCursor loading={this.state.isLoading} />
-
-        <View style={commonStyles.flex1}>
-          <View>
-            {!this.state.showImageBrowser && this.state.view !== Views.PAYMENT_ONLINE ? this.props.topBar : null}
-          </View>
-
-          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} sensor={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
-
-          {this.state.fontLoaded ?
-            <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>
-              <CustomScrollView ref={(element) => this.scroll = element}>
-                {this.state.view !== Views.PREVIEW && this.state.view !== Views.PAYMENT_ONLINE ?
-                  <View>
-                    {
-                      this.state.adId == null ?
-                        <PublishProgressBar currentScreen={this.state.currentScreen} />
-                        :
-                        <EditHead postingAd={this.state.postingAd} />
-                    }
-                  </View>
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_1 ?
-                  <Publish1 postingAd={this.state.postingAd}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    fullPosting={this.state.fullPosting}
-                    goToPage={(view, editingStepOne) => this._goToPage(view, editingStepOne)}
-                    saveEditAd={() => this._saveEditAd()}
-                    realEstateDeveloper={this.state.realEstateDeveloper}
-                    businessId={this.state.businessId}
-                    showNoPromotions={() => this.popupNoPromotions.show()} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_2 ?
-                  <Publish2 postingAd={this.state.postingAd}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view) => this._goToPage(view)}
-                    replacePage={(view) => this._updateCurrentScreen(view)}
-                    baseUrl={this.props.baseUrl}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    hereApiKey={this.props.hereApiKey}
-                    fullPosting={this.state.fullPosting}
-                    businessId={this.state.businessId} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_2_B ?
-                  <Publish2b postingAd={this.state.postingAd}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view) => this._goToPage(view)}
-                    replacePage={(view) => this._updateCurrentScreen(view)}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting}
-                    businessId={this.state.businessId} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_3 ?
-                  <Publish3 postingAd={this.state.postingAd}
-                    editingStepOne={this.state.editingStepOne}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view) => this._goToPage(view)}
-                    goBack={() => this.goBack()}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_4 ?
-                  <Publish4 postingAd={this.state.postingAd}
-                    ref={publish4 => this.publish4 = publish4}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view) => this._goToPage(view)}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting}
-                    maxPictures={this.state.maxPictures} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_5 ?
-                  <Publish5 postingAd={this.state.postingAd}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view) => this._goToPage(view)}
-                    businessId={this.state.businessId}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PUBLISH_6 ?
-                  <Publish6 postingAd={this.state.postingAd}
-                    country={this.props.country}
-                    businessId={this.state.businessId}
-                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                    saveEditAd={() => this._saveEditAd()}
-                    goToPage={(view, params) => this._goToPage(view, null, params)}
-                    request={this.props.request}
-                    context={this.props.context}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PREVIEW ?
-                  <Preview postingAd={this.state.postingAd}
-                    country={this.props.country}
-                    goBack={() => this.goBack()}
-                    showLoading={() => this._showLoading()}
-                    hideLoading={() => this._hideLoading()}
-                    businessId={this.state.businessId}
-                    request={this.props.request}
-                    highlight={() => this._goToPage(Views.PAYMENT_ONLINE)}
-                    params={this.state.params} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.EDIT_SELECTOR ?
-                  <PostingEdit postingAd={this.state.postingAd}
-                    topBar={this.props.topBar}
-                    goToPage={(view) => this._goToPage(view)} />
-                  :
-                  null
-                }
-
-                {this.state.view === Views.PAYMENT_ONLINE ?
-                  <PaymentOnlinePopup
-                    context={this.props.context}
-                    request={this.props.request}
-                    topBar={this.props.topBar}
-                    adId={this.state.postingAd.id}
-                    country={this.props.country}
-                    goToPrivacy={this.props.goToPrivacy}
-                    changeView={this.props.changeView}
-                    close={this.goBack}
-                    goBack={() => this.setState({ view: Views.PREVIEW }, () => this.goBack())} />
-                  :
-                  null
-                }
-
-              </CustomScrollView>
-              <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromoteTitle', { product: '' })} headerColor={commonStyles.red} ref={popupAdvice => this.popupNoListings = popupAdvice}
-                onClose={async () => this.state.view !== Views.PREVIEW ? this.goBack() : null} hideButton={true}>
-                <OutputText style={commonStyles.popupText}>{strings('setup.noPromoteSubtitle', { countryPhone: this.state.countryPhone })}</OutputText>
-                <TouchableOpacity style={[commonStyles.okBtnBoxPopup, commonStyles.okBtnPopup]} onPress={() => this.popupNoListings.hide()} >
-                  <OutputText style={commonStyles.okBtnTextPopup}>{strings('setup.adviceOK')}</OutputText>
-                </TouchableOpacity>
-              </PopupAdvice>
-
-              <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromotionTitle')} headerColor={commonStyles.red} ref={popupAdvice => this.popupNoPromotions = popupAdvice}
-                onClose={() => this.goBack()} hideButton={true}>
-                <OutputText style={commonStyles.popupText}>{strings('setup.noPromotionText')}</OutputText>
-                <TouchableOpacity style={[commonStyles.okBtnBoxPopup, commonStyles.okBtnPopup]} onPress={() => this.goBack()} >
-                  <OutputText style={commonStyles.okBtnTextPopup}>{strings('setup.adviceOK')}</OutputText>
-                </TouchableOpacity>
-              </PopupAdvice>
-            </View >
-            :
-            null
-          }
-        </View>
-      </View >
+      <View style={commonStyles.flex1}>
+        <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} sensor={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
+
+        {this.state.fontLoaded ?
+          <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>
+            <CustomScrollView ref={(element) => this.scroll = element}>
+              {this.state.view !== Views.PREVIEW && this.state.view !== Views.PAYMENT_ONLINE ?
+                <View>
+                  {
+                    this.state.adId == null ?
+                      <PublishProgressBar currentScreen={this.state.currentScreen} />
+                      :
+                      <EditHead postingAd={this.state.postingAd} />
+                  }
+                </View>
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_1 ?
+                <Publish1 postingAd={this.state.postingAd}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  fullPosting={this.state.fullPosting}
+                  goToPage={(view, editingStepOne) => this._goToPage(view, editingStepOne)}
+                  saveEditAd={() => this._saveEditAd()}
+                  realEstateDeveloper={this.state.realEstateDeveloper}
+                  businessId={this.state.businessId}
+                  showNoPromotions={() => this.popupNoPromotions.show()} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_2 ?
+                <Publish2 postingAd={this.state.postingAd}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view) => this._goToPage(view)}
+                  replacePage={(view) => this._updateCurrentScreen(view)}
+                  baseUrl={this.props.baseUrl}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  hereApiKey={this.props.hereApiKey}
+                  fullPosting={this.state.fullPosting}
+                  businessId={this.state.businessId} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_2_B ?
+                <Publish2b postingAd={this.state.postingAd}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view) => this._goToPage(view)}
+                  replacePage={(view) => this._updateCurrentScreen(view)}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  fullPosting={this.state.fullPosting}
+                  businessId={this.state.businessId}
+                  locationList={this.state.locationList} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_3 ?
+                <Publish3 postingAd={this.state.postingAd}
+                  editingStepOne={this.state.editingStepOne}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view) => this._goToPage(view)}
+                  goBack={() => this.goBack()}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  fullPosting={this.state.fullPosting} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_4 ?
+                <Publish4 postingAd={this.state.postingAd}
+                  ref={publish4 => this.publish4 = publish4}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view) => this._goToPage(view)}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  fullPosting={this.state.fullPosting}
+                  maxPictures={this.state.maxPictures} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_5 ?
+                <Publish5 postingAd={this.state.postingAd}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view) => this._goToPage(view)}
+                  businessId={this.state.businessId}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  fullPosting={this.state.fullPosting} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PUBLISH_6 ?
+                <Publish6 postingAd={this.state.postingAd}
+                  country={this.props.country}
+                  businessId={this.state.businessId}
+                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                  saveEditAd={() => this._saveEditAd()}
+                  goToPage={(view, params) => this._goToPage(view, null, params)}
+                  request={this.props.request}
+                  context={this.props.context}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  fullPosting={this.state.fullPosting} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PREVIEW ?
+                <Preview postingAd={this.state.postingAd}
+                  country={this.props.country}
+                  goBack={() => this.goBack()}
+                  showLoading={() => this._showLoading()}
+                  hideLoading={() => this._hideLoading()}
+                  businessId={this.state.businessId}
+                  request={this.props.request}
+                  highlight={() => this._goToPage(Views.PAYMENT_ONLINE)}
+                  params={this.state.params} />
+                :
+                null
+              }
+
+              {this.state.view === Views.EDIT_SELECTOR ?
+                <PostingEdit postingAd={this.state.postingAd}
+                  goToPage={(view) => this._goToPage(view)} />
+                :
+                null
+              }
+
+              {this.state.view === Views.PAYMENT_ONLINE ?
+                <PaymentOnlinePopup
+                  context={this.props.context}
+                  request={this.props.request}
+                  adId={this.state.postingAd.id}
+                  country={this.props.country}
+                  goToPrivacy={this.props.goToPrivacy}
+                  changeView={this.props.changeView}
+                  showTopBar={() => this.props.showTopBar()}
+                  hideTopBar={() => this.props.hideTopBar()}
+                  close={this.goBack}
+                  goBack={() => this.setState({ view: Views.PREVIEW }, () => this.goBack())} />
+                :
+                null
+              }
+
+            </CustomScrollView>
+            <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromoteTitle', { product: '' })} headerColor={commonStyles.red} ref={popupAdvice => this.popupNoListings = popupAdvice}
+              onClose={async () => this.state.view !== Views.PREVIEW ? this.goBack() : null} hideButton={true}>
+              <OutputText style={commonStyles.popupText}>{strings('setup.noPromoteSubtitle', { countryPhone: this.state.countryPhone })}</OutputText>
+              <TouchableOpacity style={[commonStyles.okBtnBoxPopup, commonStyles.okBtnPopup]} onPress={() => this.popupNoListings.hide()} >
+                <OutputText style={commonStyles.okBtnTextPopup}>{strings('setup.adviceOK')}</OutputText>
+              </TouchableOpacity>
+            </PopupAdvice>
+
+            <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromotionTitle')} headerColor={commonStyles.red} ref={popupAdvice => this.popupNoPromotions = popupAdvice}
+              onClose={() => this.goBack()} hideButton={true}>
+              <OutputText style={commonStyles.popupText}>{strings('setup.noPromotionText')}</OutputText>
+              <TouchableOpacity style={[commonStyles.okBtnBoxPopup, commonStyles.okBtnPopup]} onPress={() => this.goBack()} >
+                <OutputText style={commonStyles.okBtnTextPopup}>{strings('setup.adviceOK')}</OutputText>
+              </TouchableOpacity>
+            </PopupAdvice>
+          </View >
+          :
+          null
+        }
+      </View>
     );
   }
 }

package/Preview.js

@@ -61,144 +61,142 @@ export default class Preview extends React.Component {
 
   render() {
     return (
-      <View>
-        <View style={{ flex: 1 }}>
-          <View style={commonStyles.formFieldset}>
-            <View style={commonStyles.confirmNote}>
-              <View style={commonStyles.row}>
-                <FontAwesomeIcon style={commonStyles.confirmIcon} name="ok" />
-                <Text style={commonStyles.confirmNoteText}>{this.props.businessId ? strings('setup.publishOK') : strings('setup.publishWait')}</Text>
-              </View>
+      <View style={commonStyles.flex1}>
+        <View style={commonStyles.formFieldset}>
+          <View style={commonStyles.confirmNote}>
+            <View style={commonStyles.row}>
+              <FontAwesomeIcon style={commonStyles.confirmIcon} name="ok" />
+              <Text style={commonStyles.confirmNoteText}>{this.props.businessId ? strings('setup.publishOK') : strings('setup.publishWait')}</Text>
+            </View>
+          </View>
+
+          {this.state.mainPicture !== null ?
+            <View style={commonStyles.progressbarInputArea}>
+              <ImageBackground style={[commonStyles.previewBox, commonStyles.photoBoxImage]} source={{ uri: this.state.mainPicture }} resizeMode='cover' borderRadius={10}>
+                {this.props.postingAd.reference ?
+                  <View style={commonStyles.previewReference}>
+                    <Text style={commonStyles.previewTitleText}>{strings('setup.ref')} {this.props.postingAd.reference}</Text>
+                  </View>
+                  :
+                  <View />
+                }
+
+                <ImageBackground style={[commonStyles.photoControls, commonStyles.previewControls]} source={require('./assets/images/bg-shadow.png')} resizeMode='stretch' borderRadius={1.5}>
+                  <View style={commonStyles.previewTitle}>
+                    <Text style={commonStyles.previewTitleText}>{this.props.postingAd.languages[0].title}</Text>
+                  </View>
+                  <Text style={[commonStyles.subNote, commonStyles.subNotePreview, commonStyles.previewText]}>{this.props.postingAd.languages[0].description != null && this.props.postingAd.languages[0].description.length > 114 ? this.props.postingAd.languages[0].description.substring(0, 114) + '...' : this.props.postingAd.languages[0].description}</Text>
+                </ImageBackground>
+              </ImageBackground>
             </View>
+            : null}
 
-            {this.state.mainPicture !== null ?
-              <View style={commonStyles.progressbarInputArea}>
-                <ImageBackground style={[commonStyles.previewBox, commonStyles.photoBoxImage]} source={{ uri: this.state.mainPicture }} resizeMode='cover' borderRadius={10}>
-                  {this.props.postingAd.reference ?
-                    <View style={commonStyles.previewReference}>
-                      <Text style={commonStyles.previewTitleText}>{strings('setup.ref')} {this.props.postingAd.reference}</Text>
+          {this.props.businessId ?
+            <View style={commonStyles.promoBox}>
+              <View style={commonStyles.row}>
+                <View style={this.state.superPremiumActive ? [commonStyles.col, commonStyles.col6, commonStyles.promoColPremium, commonStyles.disabled] : [commonStyles.col, commonStyles.col6, commonStyles.promoColPremium]}>
+                  <View style={[commonStyles.row, { marginBottom: 5 }]}>
+                    <View style={[commonStyles.col, commonStyles.col30]}>
+                      <Image style={commonStyles.imgPremium} source={require('./assets/images/premium.png')} resizeMode='contain' />
+                    </View>
+                    <View style={[commonStyles.col, commonStyles.col70]}>
+                      <Text style={commonStyles.promoSub}>{strings('setup.makeIt')}</Text>
+                      <Text style={[commonStyles.promoTitle, commonStyles.blueTitle]}>{strings('setup.premium').toUpperCase()}</Text>
+                    </View>
+                  </View>
+                  <Text style={[commonStyles.legalNoteText, commonStyles.promoNote]}>{strings('setup.makePremium')}</Text>
+                  {this.state.premiumActive ?
+                    <View style={[commonStyles.row, commonStyles.superBtn, commonStyles.btnBlue2]} >
+                      <Text style={commonStyles.superBtnText}>{strings('setup.active').toUpperCase()}</Text>
                     </View>
                     :
-                    <View />
+                    <TouchableOpacity style={[commonStyles.superBtn, commonStyles.btnBlue1]} underlayColor="#104a7a" onPress={() => this.makePremium()} disabled={this.state.superPremiumActive}>
+                      <Text style={commonStyles.superBtnText}>{strings('setup.useIt').toUpperCase()}</Text>
+                    </TouchableOpacity>
                   }
+                </View>
 
-                  <ImageBackground style={[commonStyles.photoControls, commonStyles.previewControls]} source={require('./assets/images/bg-shadow.png')} resizeMode='stretch' borderRadius={1.5}>
-                    <View style={commonStyles.previewTitle}>
-                      <Text style={commonStyles.previewTitleText}>{this.props.postingAd.languages[0].title}</Text>
+                <View style={this.state.premiumActive ? [commonStyles.col, commonStyles.col6, commonStyles.promoColSuper, commonStyles.disabled] : [commonStyles.col, commonStyles.col6, commonStyles.promoColSuper]}>
+                  <View style={[commonStyles.row, { marginBottom: 5 }]}>
+                    <View style={[commonStyles.col, commonStyles.col30]}>
+                      <Image style={commonStyles.imgPremium} source={require('./assets/images/superpremium.png')} resizeMode='contain' />
                     </View>
-                    <Text style={[commonStyles.subNote, commonStyles.subNotePreview, commonStyles.previewText]}>{this.props.postingAd.languages[0].description != null && this.props.postingAd.languages[0].description.length > 114 ? this.props.postingAd.languages[0].description.substring(0, 114) + '...' : this.props.postingAd.languages[0].description}</Text>
-                  </ImageBackground>
-                </ImageBackground>
-              </View>
-              : null}
-
-            {this.props.businessId ?
-              <View style={commonStyles.promoBox}>
-                <View style={commonStyles.row}>
-                  <View style={this.state.superPremiumActive ? [commonStyles.col, commonStyles.col6, commonStyles.promoColPremium, commonStyles.disabled] : [commonStyles.col, commonStyles.col6, commonStyles.promoColPremium]}>
-                    <View style={[commonStyles.row, { marginBottom: 5 }]}>
-                      <View style={[commonStyles.col, commonStyles.col30]}>
-                        <Image style={commonStyles.imgPremium} source={require('./assets/images/premium.png')} resizeMode='contain' />
-                      </View>
-                      <View style={[commonStyles.col, commonStyles.col70]}>
+                    <View style={[commonStyles.col, commonStyles.col70]}>
+                      <View style={[commonStyles.row, { justifyContent: 'center' }]}>
                         <Text style={commonStyles.promoSub}>{strings('setup.makeIt')}</Text>
-                        <Text style={[commonStyles.promoTitle, commonStyles.blueTitle]}>{strings('setup.premium').toUpperCase()}</Text>
+                        <Text style={[commonStyles.promoSubItalic, commonStyles.orangeTitle]}> {strings('setup.super').toUpperCase()}</Text>
                       </View>
+                      <Text style={[commonStyles.promoTitle, commonStyles.orangeTitle]}>{strings('setup.premium').toUpperCase()}</Text>
                     </View>
-                    <Text style={[commonStyles.legalNoteText, commonStyles.promoNote]}>{strings('setup.makePremium')}</Text>
-                    {this.state.premiumActive ?
-                      <View style={[commonStyles.row, commonStyles.superBtn, commonStyles.btnBlue2]} >
-                        <Text style={commonStyles.superBtnText}>{strings('setup.active').toUpperCase()}</Text>
-                      </View>
-                      :
-                      <TouchableOpacity style={[commonStyles.superBtn, commonStyles.btnBlue1]} underlayColor="#104a7a" onPress={() => this.makePremium()} disabled={this.state.superPremiumActive}>
-                        <Text style={commonStyles.superBtnText}>{strings('setup.useIt').toUpperCase()}</Text>
-                      </TouchableOpacity>
-                    }
                   </View>
-
-                  <View style={this.state.premiumActive ? [commonStyles.col, commonStyles.col6, commonStyles.promoColSuper, commonStyles.disabled] : [commonStyles.col, commonStyles.col6, commonStyles.promoColSuper]}>
-                    <View style={[commonStyles.row, { marginBottom: 5 }]}>
-                      <View style={[commonStyles.col, commonStyles.col30]}>
-                        <Image style={commonStyles.imgPremium} source={require('./assets/images/superpremium.png')} resizeMode='contain' />
-                      </View>
-                      <View style={[commonStyles.col, commonStyles.col70]}>
-                        <View style={[commonStyles.row, { justifyContent: 'center' }]}>
-                          <Text style={commonStyles.promoSub}>{strings('setup.makeIt')}</Text>
-                          <Text style={[commonStyles.promoSubItalic, commonStyles.orangeTitle]}> {strings('setup.super').toUpperCase()}</Text>
-                        </View>
-                        <Text style={[commonStyles.promoTitle, commonStyles.orangeTitle]}>{strings('setup.premium').toUpperCase()}</Text>
-                      </View>
+                  <Text style={[commonStyles.legalNoteText, commonStyles.promoNote]}>{strings('setup.makeSuperpremium')}</Text>
+                  {this.state.superPremiumActive ?
+                    <View style={[commonStyles.row, commonStyles.superBtn, commonStyles.btnOrange2]} >
+                      <Text style={commonStyles.superBtnText}>{strings('setup.active').toUpperCase()}</Text>
                     </View>
-                    <Text style={[commonStyles.legalNoteText, commonStyles.promoNote]}>{strings('setup.makeSuperpremium')}</Text>
-                    {this.state.superPremiumActive ?
-                      <View style={[commonStyles.row, commonStyles.superBtn, commonStyles.btnOrange2]} >
-                        <Text style={commonStyles.superBtnText}>{strings('setup.active').toUpperCase()}</Text>
-                      </View>
-                      :
-                      <TouchableOpacity style={[commonStyles.superBtn, commonStyles.btnOrange1]} underlayColor="#ff5d00" onPress={() => this.makeSuperPremium()} disabled={this.state.premiumActive}>
-                        <Text style={commonStyles.superBtnText}>{strings('setup.useIt').toUpperCase()}</Text>
-                      </TouchableOpacity>
-                    }
-                  </View>
+                    :
+                    <TouchableOpacity style={[commonStyles.superBtn, commonStyles.btnOrange1]} underlayColor="#ff5d00" onPress={() => this.makeSuperPremium()} disabled={this.state.premiumActive}>
+                      <Text style={commonStyles.superBtnText}>{strings('setup.useIt').toUpperCase()}</Text>
+                    </TouchableOpacity>
+                  }
                 </View>
               </View>
-              :
-              <View style={commonStyles.infoPreview}>
-                <View style={commonStyles.row}>
-                  <View style={commonStyles.col7}>
-                    <View style={commonStyles.row}>
-                      <FontAwesomeIcon style={[commonStyles.previewIcon, commonStyles.blue]} name="location" />
-                      <Text style={commonStyles.previewInfoText}>{this.state.location}</Text>
-                    </View>
-                    <View style={commonStyles.row}>
-                      <FontAwesomeIcon style={commonStyles.previewIcon} name="key" />
-                      <Text style={commonStyles.previewInfoText}>{this.state.transaction}</Text>
-                    </View>
-                    <View style={commonStyles.row}>
-                      <FontAwesomeIcon style={commonStyles.previewIcon} name="tags" />
-                      <Text style={commonStyles.previewInfoText}>{this.state.adType}</Text>
-                    </View>
+            </View>
+            :
+            <View style={commonStyles.infoPreview}>
+              <View style={commonStyles.row}>
+                <View style={commonStyles.col7}>
+                  <View style={commonStyles.row}>
+                    <FontAwesomeIcon style={[commonStyles.previewIcon, commonStyles.blue]} name="location" />
+                    <Text style={commonStyles.previewInfoText}>{this.state.location}</Text>
                   </View>
-                  <View style={commonStyles.col5}>
-                    <View style={commonStyles.row}>
-                      <FontAwesomeIcon style={[commonStyles.previewIcon, commonStyles.blue]} name="money" />
-
-                      {this.state.showPrice ?
-                        <View style={commonStyles.row}>
-                          < DisplayPrice style={commonStyles.previewInfoText} value={this.state.price} currency={this.state.currency} country={this.props.country} />
-                        </View>
-                        :
-                        <Text style={commonStyles.previewInfoText}>{strings('setup.contactOwner')}</Text>
-                      }
-                    </View>
-                    {this.state.surface !== undefined ?
+                  <View style={commonStyles.row}>
+                    <FontAwesomeIcon style={commonStyles.previewIcon} name="key" />
+                    <Text style={commonStyles.previewInfoText}>{this.state.transaction}</Text>
+                  </View>
+                  <View style={commonStyles.row}>
+                    <FontAwesomeIcon style={commonStyles.previewIcon} name="tags" />
+                    <Text style={commonStyles.previewInfoText}>{this.state.adType}</Text>
+                  </View>
+                </View>
+                <View style={commonStyles.col5}>
+                  <View style={commonStyles.row}>
+                    <FontAwesomeIcon style={[commonStyles.previewIcon, commonStyles.blue]} name="money" />
+
+                    {this.state.showPrice ?
                       <View style={commonStyles.row}>
-                        <FontAwesomeIcon style={commonStyles.previewIcon} name="users" />
-                        <Text style={commonStyles.previewInfoText}>{this.state.surface}</Text>
+                        < DisplayPrice style={commonStyles.previewInfoText} value={this.state.price} currency={this.state.currency} country={this.props.country} />
                       </View>
-                      : null}
+                      :
+                      <Text style={commonStyles.previewInfoText}>{strings('setup.contactOwner')}</Text>
+                    }
                   </View>
+                  {this.state.surface !== undefined ?
+                    <View style={commonStyles.row}>
+                      <FontAwesomeIcon style={commonStyles.previewIcon} name="users" />
+                      <Text style={commonStyles.previewInfoText}>{this.state.surface}</Text>
+                    </View>
+                    : null}
                 </View>
               </View>
-            }
-            {!this.props.businessId && this.state.showPaymentOnline ?
-              <View style={commonStyles.previewHighlightContainer}>
-                <TouchableOpacity style={[commonStyles.previewHighlightButton, commonStyles.alignCenter]} activeOpacity={0.5} onPress={() => this.props.highlight()}>
-                  <Image style={commonStyles.previewHighlightImage} source={require('./assets/images/sparks.png')} />
-                  <Text style={commonStyles.previewHighlightText}>{strings('setup.highlight')}</Text>
-                </TouchableOpacity>
-              </View>
-              :
-              null
-            }
-          </View>
+            </View>
+          }
+          {!this.props.businessId && this.state.showPaymentOnline ?
+            <View style={commonStyles.previewHighlightContainer}>
+              <TouchableOpacity style={[commonStyles.previewHighlightButton, commonStyles.alignCenter]} activeOpacity={0.5} onPress={() => this.props.highlight()}>
+                <Image style={commonStyles.previewHighlightImage} source={require('./assets/images/sparks.png')} />
+                <Text style={commonStyles.previewHighlightText}>{strings('setup.highlight')}</Text>
+              </TouchableOpacity>
+            </View>
+            :
+            null
+          }
+        </View>
 
-          <View style={commonStyles.previewBackButton}>
-            <TouchableOpacity activeOpacity={0.5} onPress={() => this.props.goBack()}>
-              <Text style={commonStyles.carteNote}>{strings('setup.returnHome')}</Text>
-            </TouchableOpacity>
-          </View>
+        <View style={commonStyles.previewBackButton}>
+          <TouchableOpacity activeOpacity={0.5} onPress={() => this.props.goBack()}>
+            <Text style={commonStyles.carteNote}>{strings('setup.returnHome')}</Text>
+          </TouchableOpacity>
         </View>
         <PopupSpendProduct adId={this.props.postingAd.id} ref={(popupShowAdvice) => { this.popupShowAdvice = popupShowAdvice }} businessId={this.props.businessId} request={this.props.request}
           showLoading={this.props.showLoading} hideLoading={this.props.hideLoading} />

package/Publish1.js

@@ -40,7 +40,9 @@ export default class Publish1 extends React.Component {
         typeBienOptions: { elements: this.getAdTypes(this.props.postingAd.transaction), selectedItem: this.props.postingAd.adType }
       })
     }
-    this.setPromotionData();
+    if (this.props.businessId != null) {
+      this.setPromotionData();
+    }
     this.props.hideLoading();
   }
 

package/Publish2b.js

@@ -10,10 +10,6 @@ import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 
-const GET_REGIONS = { method: 'GET', url: '/controller/countries/{countryCode}/regions' };
-const GET_CITIES_FROM_REGION = { method: 'GET', url: '/controller/regions/{regionId}/cities' };
-const GET_DISTRICTS_FROM_CITY = { method: 'GET', url: '/controller/cities/{cityId}/districts' };
-const GET_TOWNS_FROM_DISTRICT = { method: 'GET', url: '/controller/districts/{districtId}/towns' };
 const GET_CHECK_ZONE = { method: 'GET', url: '/controller/posting/check-zone' };
 
 export default class Publish2b extends React.Component {
@@ -21,6 +17,7 @@ export default class Publish2b extends React.Component {
     super(props);
 
     this.state = {
+      locationsList: this.props.locationList,
       regionOptions: {
         elements: [{ section: true, value: null, label: strings('setup.region') }],
         selectedItem: this.props.postingAd.region
@@ -46,167 +43,104 @@ export default class Publish2b extends React.Component {
   }
 
   loadData = async () => {
-    this.props.showLoading();
-
     const region = this.props.postingAd.region;
     const city = this.props.postingAd.city;
     const district = this.props.postingAd.district;
     const town = this.props.postingAd.town;
 
     await this.loadRegions();
-    await this.loadCities(region, false);
-    await this.loadDistricts(city, false);
-    await this.loadTowns(district, false);
+    await this.loadCities(region);
+    await this.loadDistricts(city);
+    await this.loadTowns(district);
 
     await this.setState({ townOptions: { ...this.state.townOptions, selectedItem: town } })
     this.props.postingAd.town = town
-
-    this.props.hideLoading();
   }
 
   async loadRegions() {
     if (this.state.regionOptions.elements.length <= 1) {
-      const responseJson = await this.props.request(this.props.context, GET_REGIONS, {});
-
-      if (responseJson.httpStatus === 200) {
-        const regionOptions = {
-          elements: [this.state.regionOptions.elements[0]],
-          selectedItem: this.props.postingAd.region
-        };
-
-        responseJson.list.map((item) => {
-          regionOptions.elements.push(item);
-        });
-
-        this.setState({ regionOptions: regionOptions });
+      const regionOptions = {
+        elements: [this.state.regionOptions.elements[0], ...this.state.locationsList.map(({ subList, ...rest }) => ({ ...rest }))],
+        selectedItem: this.props.postingAd.region
       }
-    }
-  }
 
-  async loadCities(value, showLoading) {
-    if (showLoading) {
-      this.props.showLoading();
+      this.setState({ regionOptions: regionOptions });
     }
+  }
 
+  async loadCities(value) {
     await this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: value } });
     this.props.postingAd.region = value;
 
     if (value !== null) {
-      const responseJson = await this.props.request(this.props.context, GET_CITIES_FROM_REGION, {
-        regionId: this.props.postingAd.region
-      });
-
-      if (responseJson.httpStatus === 200) {
-        var cityOptions = {
-          elements: [this.state.cityOptions.elements[0]],
-          selectedItem: null
-        };
-
-        responseJson.list.map((item) => {
-          cityOptions.elements.push(item);
-        });
-
-        await this.setState({
-          cityOptions: cityOptions,
-          districtOptions: { elements: [this.state.districtOptions.elements[0]], selectedItem: null },
-          townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null }
-        });
-
-        this.props.postingAd.city = null;
-        this.props.postingAd.district = null;
-        this.props.postingAd.town = null;
+      const region = this.state.locationsList.filter(r => r.value === value)[0];
+      const cityOptions = {
+        elements: [this.state.cityOptions.elements[0], ...region.subList.map(({ subList, ...rest }) => ({ ...rest }))],
+        selectedItem: null
       }
-    }
 
-    if (showLoading) {
-      this.props.hideLoading();
-    }
-  }
+      await this.setState({
+        cityOptions: cityOptions,
+        districtOptions: { elements: [this.state.districtOptions.elements[0]], selectedItem: null },
+        townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null }
+      });
 
-  async loadDistricts(value, showLoading) {
-    if (showLoading) {
-      this.props.showLoading();
+      this.props.postingAd.city = null;
+      this.props.postingAd.district = null;
+      this.props.postingAd.town = null;
     }
+  }
 
+  async loadDistricts(value) {
     await this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: value } });
     this.props.postingAd.city = value;
 
     if (value != null) {
-      const responseJson = await this.props.request(this.props.context, GET_DISTRICTS_FROM_CITY, {
-        cityId: this.props.postingAd.city
-      });
-
-      if (responseJson.httpStatus === 200) {
-        let districtOptions = {
-          elements: [this.state.districtOptions.elements[0]],
-          selectedItem: null
-        };
-
-        responseJson.list.map((item) => {
-          districtOptions.elements.push(item);
-        });
+      const city = this.state.locationsList.filter(r => r.value === this.props.postingAd.region)[0].subList.filter(c => c.value === value)[0];
+      const districtOptions = {
+        elements: [this.state.districtOptions.elements[0], ...city.subList.map(({ subList, ...rest }) => ({ ...rest }))],
+        selectedItem: null
+      }
 
-        if (responseJson.list.length == 1) {
-          districtOptions.selectedItem = responseJson.list[0].value;
-        }
+      if (city.subList.length == 1) {
+        districtOptions.selectedItem = city.subList[0].value;
+      }
 
-        await this.setState({ districtOptions: districtOptions });
-        this.props.postingAd.district = null;
-        this.props.postingAd.town = null;
+      await this.setState({ districtOptions: districtOptions });
+      this.props.postingAd.district = null;
+      this.props.postingAd.town = null;
 
-        if (responseJson.list.length == 1) {
-          this.inputSelectDistrict?.onSubmitValidate();
-          await this.loadTowns(districtOptions.selectedItem);
-        } else {
-          await this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
-        }
+      if (city.subList.length == 1) {
+        this.inputSelectDistrict?.onSubmitValidate();
+        await this.loadTowns(districtOptions.selectedItem);
+      } else {
+        await this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
       }
     }
-
-    if (showLoading) {
-      this.props.hideLoading();
-    }
   }
 
-  async loadTowns(value, showLoading) {
-    if (showLoading) {
-      this.props.showLoading();
-    }
-
+  async loadTowns(value) {
     await this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: value } })
     this.props.postingAd.district = value;
 
     if (value != null) {
-      const responseJson = await this.props.request(this.props.context, GET_TOWNS_FROM_DISTRICT, {
-        districtId: this.props.postingAd.district
-      });
-
-      if (responseJson.httpStatus === 200) {
-        var townOptions = {
-          elements: [this.state.townOptions.elements[0]],
-          selectedItem: null
-        };
-
-        responseJson.list.map((item) => {
-          townOptions.elements.push(item);
-        });
+      const district = this.state.locationsList.filter(r => r.value === this.props.postingAd.region)[0].subList.filter(c => c.value === this.props.postingAd.city)[0].subList.filter(d => d.value === value)[0];
+      const townOptions = {
+        elements: [this.state.townOptions.elements[0], ...district.subList],
+        selectedItem: null
+      }
 
-        if (responseJson.list.length == 1) {
-          townOptions.selectedItem = responseJson.list[0].value;
-          this.props.postingAd.town = townOptions.selectedItem;
-        }
+      if (district.subList.length == 1) {
+        townOptions.selectedItem = district.subList[0].value;
+        this.props.postingAd.town = townOptions.selectedItem;
+      }
 
-        await this.setState({ townOptions: townOptions });
+      await this.setState({ townOptions: townOptions });
 
-        if (responseJson.list.length == 1) {
-          this.inputSelectTown?.onSubmitValidate();
-        }
+      if (district.subList.length == 1) {
+        this.inputSelectTown?.onSubmitValidate();
       }
     }
-
-    if (showLoading) {
-      this.props.hideLoading();
-    }
   }
 
   async nextStep() {
@@ -216,7 +150,7 @@ export default class Publish2b extends React.Component {
         cityId: this.props.postingAd.city
       });
 
-      if (responseCheckZone.value === 'true') {      
+      if (responseCheckZone.value === 'true') {
         if (this.props.postingAd.id == null || this.props.fullPosting) {
           this.props.goToPage(Views.PUBLISH_3);
         } else {
@@ -246,7 +180,7 @@ export default class Publish2b extends React.Component {
 
   render() {
     return (
-      <View style={{ flex: 1}}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.location')}</Text>
@@ -264,7 +198,7 @@ export default class Publish2b extends React.Component {
               required={true}
               scroll={(ref) => this.props.scroll(ref)}
               options={this.state.regionOptions}
-              onChange={(value) => this.loadCities(value, true)}
+              onChange={(value) => this.loadCities(value)}
               ref={(element) => this.inputSelectRegion = element}
               selectStyle={commonStyles.inputSelect} />
             <InputSelect
@@ -274,7 +208,7 @@ export default class Publish2b extends React.Component {
               required={true}
               scroll={(ref) => this.props.scroll(ref)}
               options={this.state.cityOptions}
-              onChange={(value) => this.loadDistricts(value, true)}
+              onChange={(value) => this.loadDistricts(value)}
               ref={(element) => this.inputSelecCity = element}
               disabled={this.state.cityOptions.elements.length === 1}
               selectStyle={commonStyles.inputSelect} />
@@ -285,7 +219,7 @@ export default class Publish2b extends React.Component {
               required={true}
               scroll={(ref) => this.props.scroll(ref)}
               options={this.state.districtOptions}
-              onChange={(value) => this.loadTowns(value, true)}
+              onChange={(value) => this.loadTowns(value)}
               ref={(element) => this.inputSelectDistrict = element}
               disabled={this.state.districtOptions.elements.length === 1}
               visible={this.state.districtOptions.elements.length !== 2}
@@ -315,7 +249,7 @@ export default class Publish2b extends React.Component {
         <PopupAdvice dialogStyle={commonStyles.popupBox} ref={(popupNoZone) => { this.popupNoZone = popupNoZone; }}
           title={strings('setup.ad_cant_post_zone')} icon={<FontAwesomeIcon name='block' />}>
           <Text style={commonStyles.popupText}></Text>
-        </PopupAdvice>           
+        </PopupAdvice>
       </View>
     );
   }

package/package.json

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