muba-posting 7.0.2 → 7.0.3

package/Publish6.js

@@ -7,6 +7,8 @@ import PhoneGroup from 'muba-phone-group';
 import PopupAdvice from 'muba-popup-advice';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
+import { navigate } from '../../app/utils/Common';
+import { Views } from '../../app/utils/Views';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 
 const GENERATE_TITLE_DESCRIPTION = { method: 'GET', url: '/controller/posting/generate-title-description' };
@@ -24,11 +26,12 @@ export default class Publish6 extends React.Component {
     this.state = {
       hideSave: false,
       requiredPhoneError: false,
-      existingPhoneError: false,
       titleDescriptionLoaded: false,
       languages: this.props.postingAd.languages,
       picturesUploaded: 0,
-      reference: this.props.postingAd.reference
+      reference: this.props.postingAd.reference,
+      showResetPassword: false,
+      showLogin: false
     }
 
     this.resetSubmitClicked();
@@ -37,6 +40,10 @@ export default class Publish6 extends React.Component {
   componentDidMount = () => {
     this.generateTitleDescription();
     this.resetSubmitClicked();
+
+    this.props.context.props.navigation.addListener('focus', async () => {
+      this.nextStep();
+    });
   }
 
   isSameList = (firstList, secondList) => {
@@ -117,8 +124,11 @@ export default class Publish6 extends React.Component {
       this.setState({ loading: true });
 
       const responseJson = await this.props.request(this.props.context, PHONE_REGISTERED, body);
-      validate = responseJson.value === 'true' && validate;
-      this.setState({ existingPhoneError: responseJson.value !== 'true' });
+      validate = responseJson.message == null && validate;
+      if (responseJson.message != null) {
+        this.setState({ phoneMessage: responseJson.message, allowRecover: responseJson.allowRecover });
+        this.popupPhoneRegistered.show();
+      }
 
       this.languageItem.forEach(element => validate = element.validateLanguageItem() && validate);
     }
@@ -143,6 +153,11 @@ export default class Publish6 extends React.Component {
     this.setState({ reference: text });
   }
 
+  recoverPassword() {
+    this.popupPhoneRegistered.hide();
+    navigate(this.props.context, Views.LOGIN, { RedirectTo: 'back', view: 'lostPassword', disableChangeView: true, loadLeadData: false })
+  }
+
   render() {
     return (
       <View style={{ flex: 1 }}>
@@ -184,10 +199,6 @@ export default class Publish6 extends React.Component {
                 <Text style={commonStyles.subNote}> {strings('setup.maxPhones')}</Text>
               </View>
 
-              <View style={commonStyles.row}>
-                <Text style={commonStyles.red}> {this.state.existingPhoneError ? strings('setup.existingPhone') : null}</Text>
-              </View>
-
               <PhoneGroup
                 ref='phoneGroup'
                 inputStyle={commonStyles.input}
@@ -265,6 +276,24 @@ export default class Publish6 extends React.Component {
             {strings('setup.posting_tip_description_10')}
           </Text>
         </PopupAdvice>
+
+        <PopupAdvice width={0.9} dialogStyle={commonStyles.popupBox} ref={popupPhoneRegistered => this.popupPhoneRegistered = popupPhoneRegistered}
+          title={strings('setup.existingPhone')} icon={<FontAwesomeIcon name='exclamation-circle' />}>
+          <Text style={[commonStyles.popupText, commonStyles.black, commonStyles.textCenter]}>
+            {this.state.phoneMessage}
+          </Text>
+
+          {this.props.businessId || !this.state.allowRecover ?
+            null
+            :
+            <View>
+              <View style={commonStyles.minDivider} />
+              <TouchableOpacity onPress={() => this.recoverPassword()}>
+                <Text style={[commonStyles.blue, commonStyles.textCenter, commonStyles.fSize15]}>{strings('setup.resetPassword')}</Text>
+              </TouchableOpacity>
+            </View>
+          }
+        </PopupAdvice>
       </View>
     );
   }

package/commonStyles.js

@@ -1348,6 +1348,15 @@ export default StyleSheet.create({
     fontFamily: 'PostingSemiBold',
     textTransform: 'uppercase',
     color: 'rgb(15, 179, 166)'
+  },
+
+  minDivider: {
+    width: '100%',
+    height: 20
+  },
+
+  fSize15: {
+    fontSize: 15
   }
 
 });

package/locales/ar.json

@@ -112,7 +112,8 @@
 		"highlight": "رفع قيمة",
 		"ad_cant_post_zone": "لا يمكنك النشر في هذه المدينة",
 		"noPromotionTitle": "أنت بحاجة إلى ترقية",
-		"noPromotionText": "لإنشاء إعلان جديد، أنت بحاجة إلى ترويج"
+		"noPromotionText": "لإنشاء إعلان جديد، أنت بحاجة إلى ترويج",
+		"resetPassword": "إعادة تعيين كلمة المرور"
 	},
 	"product": {
 		"LISTING": "قوائم",

package/locales/en.json

@@ -112,7 +112,8 @@
     "highlight": "Highlight",
     "ad_cant_post_zone": "You can't post in this city",
     "noPromotionTitle": "You need a promotion",
-    "noPromotionText": "To create a new ad, you need a promotion"
+    "noPromotionText": "To create a new ad, you need a promotion",
+    "resetPassword": "Recover password"
   },
   "product": {
     "LISTING": "Listing",

package/locales/es.json

@@ -112,7 +112,8 @@
     "highlight": "Destacar",
     "ad_cant_post_zone": "No puedes publicar en esta ciudad",
     "noPromotionTitle": "Necesitas una promoción",
-    "noPromotionText": "Para crear un nuevo anuncio, necesitas una promoción"
+    "noPromotionText": "Para crear un nuevo anuncio, necesitas una promoción",
+    "resetPassword": "Recuperar contraseña"
   },
   "product": {
     "LISTING": "Listing",

package/locales/fr.json

@@ -112,7 +112,8 @@
     "highlight": "Mettre en valeur",
     "ad_cant_post_zone": "Vous ne pouvez pas poster dans cette ville",
     "noPromotionTitle": "Vous avez besoin d'une promotion",
-    "noPromotionText": "Pour créer une nouvelle annonce, vous avez besoin d'une promotion"
+    "noPromotionText": "Pour créer une nouvelle annonce, vous avez besoin d'une promotion",
+    "resetPassword": "Récupérer le mot de passe"
   },
   "product": {
     "LISTING": "Liste",

package/locales/it.json

@@ -112,7 +112,8 @@
     "highlight": "Evidenziare",
     "ad_cant_post_zone": "Non puoi postare in questa città",
     "noPromotionTitle": "Hai bisogno di una promozione",
-    "noPromotionText": "Per creare un nuovo annuncio, è necessaria una promozione"
+    "noPromotionText": "Per creare un nuovo annuncio, è necessaria una promozione",
+    "resetPassword": "Recupero della password"
   },
   "product": {
     "LISTING": "Inserzioni",

package/locales/nl.json

@@ -112,7 +112,8 @@
     "highlight": "Highlighting",
     "ad_cant_post_zone": "In deze stad mag je niet posten",
     "noPromotionTitle": "Je hebt een promotie nodig",
-    "noPromotionText": "Om een nieuwe advertentie te maken, heb je een promotie nodig"
+    "noPromotionText": "Om een nieuwe advertentie te maken, heb je een promotie nodig",
+    "resetPassword": "Wachtwoord herstellen"
   },
   "product": {
     "LISTING": "Advertenties",

package/package.json

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