From 54f30cee626e82a5d82b835d7b2817ef598c95fc Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Mon, 17 Jan 2022 00:13:59 +0800 Subject: [PATCH 1/4] fix issue 5954 --- src/shared/components/Settings/Profile/BasicInfo/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx index 1bec3d5d08..20c2398621 100644 --- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx +++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx @@ -206,6 +206,7 @@ export default class BasicInfo extends ConsentComponent { newBasicInfo.tshirtSize = null; } + newProfileInfo.addresses[0] = _.omit(newProfileInfo.addresses[0], ['createdAt', 'updatedBy', 'createdBy', 'updatedAt']); _.forEach(newProfileInfo.addresses[0], (value, key) => { newProfileInfo.addresses[0][key] = _.trim(value); }); From 455a5a1f73bd8bc4bc0bb7f07d200d02a230f3f0 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Wed, 16 Feb 2022 08:20:38 +0600 Subject: [PATCH 2/4] ci: deploy on dev --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fdc185e38f..883b648961 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -343,6 +343,7 @@ workflows: branches: only: - develop + - fix/settings-save-fail # This is alternate dev env for parallel testing - "build-test": context : org-global From 8c1dc2f1ae45a8c7f7334280e09c8a770fabb3bb Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Wed, 16 Feb 2022 17:39:18 +0600 Subject: [PATCH 3/4] fix: homeCountryCode can not be null --- src/shared/components/Settings/Profile/BasicInfo/index.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx index 20c2398621..3933293bb1 100644 --- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx +++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx @@ -241,6 +241,10 @@ export default class BasicInfo extends ConsentComponent { } } + if (newProfileInfo.homeCountryCode == null) { + delete newProfileInfo.homeCountryCode; + } + const updateProfileData = { ...newProfileInfo, }; From 9a3e7c97d6ef5271a681fa387382a19991577b9f Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Wed, 16 Feb 2022 18:19:30 +0600 Subject: [PATCH 4/4] ci: deploy to staging --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 883b648961..c76c230d2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -373,6 +373,7 @@ workflows: only: - develop - features/mm-dashboard + - fix/settings-save-fail # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration