From 0b9aff98fe2c7ccbe4a29d7979feff1bf4f9bf9c Mon Sep 17 00:00:00 2001
From: Nowshad <nowshad.programmer@gmail.com>
Date: Tue, 2 Nov 2021 14:58:00 +0600
Subject: [PATCH] fixed mapping.

---
 src/routes/ContactDetails/index.jsx | 12 +++---------
 src/services/basicInfo.js           | 10 ++++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/routes/ContactDetails/index.jsx b/src/routes/ContactDetails/index.jsx
index 0079e0b..b9f5bf0 100644
--- a/src/routes/ContactDetails/index.jsx
+++ b/src/routes/ContactDetails/index.jsx
@@ -145,9 +145,9 @@ const ContactDetails = () => {
     return getMyBasicInfo(authUser.handle).then(result => {
       let myBasicInfo = result?.data?.result?.content[0].traits?.data[0];
       if(myBasicInfo === undefined){
-        return addMyAddress(authUser.handle, addressMapped)
+        return addMyAddress(authUser.handle, addressMapped, country)
       }else{
-        return updateMyAddress(authUser.handle, myBasicInfo, addressMapped)
+        return updateMyAddress(authUser.handle, myBasicInfo, addressMapped, country)
       }
     }).catch(e => {
       setIsLoading(false);
@@ -160,10 +160,6 @@ const ContactDetails = () => {
     // saving contact details
     // map data before passing to server
     let contactDetailsMapped = {
-      city: city,
-      state: state,
-      zip: zipCode,                            
-      country: country,
       timeZone: timeZone,
       workingHourStart: startTime,
       workingHourEnd: endTime,
@@ -192,9 +188,7 @@ const ContactDetails = () => {
     setIsLoading(true);
     // save address (basic info) then contact details before navigate
     e.preventDefault();
-    saveMyAddress().then(() => {
-      return saveContactDetails()
-    }).then(() => {
+    Promise.all([saveMyAddress(), saveContactDetails()]).then(() => {
       setIsLoading(false);
       toastr.success('Success', 'contact details saved successfully!');
       navigate('/onboard/payment-setup');
diff --git a/src/services/basicInfo.js b/src/services/basicInfo.js
index e8cd92c..b3d48da 100644
--- a/src/services/basicInfo.js
+++ b/src/services/basicInfo.js
@@ -47,14 +47,15 @@ export function updateMyPrimaryInterests(myusername, prevBasicInfo, interestsFla
 /**
  * Add my address, if the basicInfo not exists
  */
-export function addMyAddress(myusername, address){
+export function addMyAddress(myusername, address, country){
   return axios.post(`${config.API.V5}/members/${myusername}/traits`, [{
     "categoryName": "Basic Info",
     "traitId": "basic_info",
     "traits": {
       "traitId": "basic_info",
       "data": [{
-        "addresses": [address]
+        "addresses": [address],
+        "country": country
       }]
     }
   }]);
@@ -63,7 +64,7 @@ export function addMyAddress(myusername, address){
 /**
  * Update my address
  */
-export function updateMyAddress(myusername, prevBasicInfo, address){
+export function updateMyAddress(myusername, prevBasicInfo, address, country){
   return axios.put(`${config.API.V5}/members/${myusername}/traits`, [{
     "categoryName": "Basic Info",
     "traitId": "basic_info",
@@ -71,7 +72,8 @@ export function updateMyAddress(myusername, prevBasicInfo, address){
       "traitId": "basic_info",
       "data": [{
         ...prevBasicInfo,
-        "addresses": [address]
+        "addresses": [address],
+        "country": country
       }]
     }
   }]);