From a8f9e84c5cc67cc17c7383377cdaec47399afcd3 Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Tue, 16 Jan 2024 11:47:31 +0800
Subject: [PATCH] update logic

---
 src/pages/Organization/DetailPage/OrganizationCard.js       | 4 ++--
 .../DetailPage_FromUser/OrganizationCard_loadFromUser.js    | 6 ++++--
 .../UserInformationCard_Individual.js                       | 4 ++--
 .../UserInformationCard_Organization.js                     | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 566dff7..2144338 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -363,7 +363,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "country",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.country,
-                                getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "hongKong" }),
+                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
@@ -374,7 +374,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "district",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.district,
-                                getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "hongKong" }),
+                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
index c0c89e2..eb66a14 100644
--- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
+++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -91,8 +91,8 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
                         faxNumber: values.faxNumber
                     },
                     addressTemp: {
-                        country: values.country,
-                        district: values.district,
+                        country: values.country.key,
+                        district: values.district.key,
                         addressLine1: values.addressLine1,
                         addressLine2: values.addressLine2,
                         addressLine3: values.addressLine3,
@@ -228,6 +228,7 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
                             label: FieldUtils.notNullFieldLabel("Country:"),
                             valueName: "country",
                             dataList: ComboData.country,
+                            getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type}) : "",
                             form: formik
                         })}
                     </Grid>
@@ -237,6 +238,7 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
                             label: FieldUtils.notNullFieldLabel("District:"),
                             valueName: "district",
                             dataList: ComboData.district,
+                            getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type}) : "",
                             form: formik
                         })}
                     </Grid>
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
index dc29d3f..8618b4a 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
@@ -411,7 +411,7 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
                                 {FieldUtils.getComboField({
                                     label: "Country:",
                                     valueName: "country",
-                                    getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "hongKong" }),
+                                    getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                     dataList: ComboData.country,
                                     disabled: (!editMode),
                                     form: formik
@@ -500,7 +500,7 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
                                     label: "District:",
                                     valueName: "district",
                                     dataList: ComboData.district,
-                                    getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "islandCombo" }),
+                                    getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                     disabled: (!editMode),
                                     form: formik
                                 })}
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index 8581baf..33ad64c 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -525,7 +525,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                     label: "Country:",
                                     valueName: "country",
                                     dataList: ComboData.country,
-                                    getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "hongKong" }),
+                                    getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                     disabled: true,
                                     form: formik
                                 })}
@@ -566,7 +566,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                     label: "District:",
                                     valueName: "district",
                                     dataList: ComboData.district,
-                                    getOptionLabel: (option) => intl.formatMessage({ id: option.type? option.type : "islandCombo" }),
+                                    getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                     disabled: true,
                                     form: formik
                                 })}