From bc569030b0958c9835d703ee63d0c18f960fa49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 2 Sep 2019 12:00:42 +0200
Subject: [PATCH] MOBILE-3131 signup: Propagate country from age verification

---
 src/core/login/pages/email-signup/email-signup.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index cf25a4ab1..0af599a07 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -52,6 +52,7 @@ export class CoreLoginEmailSignupPage {
     // Data for age verification.
     ageVerificationForm: FormGroup;
     countryControl: FormControl;
+    signUpCountryControl: FormControl;
     isMinor = false; // Whether the user is minor age.
     ageDigitalConsentVerification: boolean; // Whether the age verification is enabled.
     supportName: string;
@@ -110,7 +111,8 @@ export class CoreLoginEmailSignupPage {
      */
     protected completeFormGroup(): void {
         this.signupForm.addControl('city', this.fb.control(this.settings.defaultcity || ''));
-        this.signupForm.addControl('country', this.fb.control(this.settings.country || ''));
+        this.signUpCountryControl = this.fb.control(this.settings.country || '');
+        this.signupForm.addControl('country', this.signUpCountryControl);
 
         // Add the name fields.
         for (const i in this.settings.namefields) {
@@ -333,6 +335,10 @@ export class CoreLoginEmailSignupPage {
 
         this.wsProvider.callAjax('core_auth_is_minor', params, {siteUrl: this.siteUrl}).then((result) => {
             if (!result.status) {
+                if (this.countryControl.value) {
+                    this.signUpCountryControl.setValue(this.countryControl.value);
+                }
+
                 // Not a minor, go ahead!
                 this.ageDigitalConsentVerification = false;
             } else {