From 39a4314289d42d176f0e60b7769cb6e8d78ebfa2 Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Wed, 8 Nov 2023 14:51:11 +0000
Subject: [PATCH] Fix manual merge profile flow

---
 .../member/components/member-merge-dialog.vue     | 13 +++++++++++--
 .../components/organization-merge-dialog.vue      | 15 ++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/frontend/src/modules/member/components/member-merge-dialog.vue b/frontend/src/modules/member/components/member-merge-dialog.vue
index 122542c2cc..cc28ba2ad3 100644
--- a/frontend/src/modules/member/components/member-merge-dialog.vue
+++ b/frontend/src/modules/member/components/member-merge-dialog.vue
@@ -64,7 +64,7 @@
 
 <script setup>
 import { computed, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import { MemberService } from '@/modules/member/member-service';
 import Message from '@/shared/message/message';
@@ -83,6 +83,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue']);
 
 const route = useRoute();
+const router = useRouter();
 
 const { doFind } = mapActions('member');
 const { fetchMembers } = useMemberStore();
@@ -124,7 +125,15 @@ const mergeSuggestion = () => {
       emit('update:modelValue', null);
 
       if (route.name === 'memberView') {
-        doFind((originalMemberPrimary.value ? props.modelValue : memberToMerge.value).id);
+        const { id } = originalMemberPrimary.value ? props.modelValue : memberToMerge.value;
+
+        doFind(id).then(() => {
+          router.replace({
+            params: {
+              id,
+            },
+          });
+        });
       } else if (route.name === 'member') {
         fetchMembers({ reload: true });
       }
diff --git a/frontend/src/modules/organization/components/organization-merge-dialog.vue b/frontend/src/modules/organization/components/organization-merge-dialog.vue
index 63e1732808..e0b43bc0dc 100644
--- a/frontend/src/modules/organization/components/organization-merge-dialog.vue
+++ b/frontend/src/modules/organization/components/organization-merge-dialog.vue
@@ -124,13 +124,14 @@ const mergeSuggestion = () => {
       emit('update:modelValue', null);
 
       if (route.name === 'organizationView') {
-        const keepId = originalOrganizationPrimary.value ? props.modelValue?.id : organizationToMerge.value?.id;
-        fetchOrganization(keepId);
-        router.push({
-          name: 'organizationView',
-          params: {
-            id: keepId,
-          },
+        const { id } = originalOrganizationPrimary.value ? props.modelValue : organizationToMerge.value;
+
+        fetchOrganization(id).then(() => {
+          router.replace({
+            params: {
+              id,
+            },
+          });
         });
       } else if (route.name === 'organization') {
         fetchOrganizations({ reload: true });