Merge branch 'new-release' into feature/integrasi_biteship

# Conflicts:
#	src/lib/address/components/EditAddress.jsx

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx
index 60ca20b7..9f038b74 100644
--- a/src/lib/address/components/EditAddress.jsx
+++ b/src/lib/address/components/EditAddress.jsx
@@ -71,7 +71,7 @@ const EditAddress = ({ id, defaultValues }) => {
 
   useEffect(() => {
     const loadProfile = async () => {
-      const dataProfile = await addressApi({ id: auth.parentId });
+      const dataProfile = await addressApi({ id: auth.partnerId });
       setValue('industry', dataProfile.industryId);
       setValue('companyType', dataProfile.companyTypeId);
       setValue('taxName', dataProfile.taxName);
@@ -246,7 +246,8 @@ const EditAddress = ({ id, defaultValues }) => {
           );
         }
       }
-      if (address?.id) {
+      // if (isUpdated?.id) {
+      if (address?.id && (auth.company && auth?.partnerId == id ? isUpdated?.id : true)) {
         toast.success('Berhasil mengubah alamat');
         router.back();
       } else {
@@ -254,10 +255,13 @@ const EditAddress = ({ id, defaultValues }) => {
         router.back();
       }
     } catch (error) {
+      console.log(error);
       toast.error('Terjadi kesalahan internal');
       router.back();
     }
 
+   
+
     // if (isUpdated?.id) {
     // if (address?.id && auth.company ? isUpdated?.id : true) {
     //   toast.success('Berhasil mengubah alamat');