fix : 모두의 통장 뒤로가기 수정

Author: younsunchae

android/app/src/main/java/com/finance/android/ui/screens/groupAccount/ContactFriendListScreen.kt

@@ -62,7 +62,9 @@ fun ContactFriendListScreen(
         },
         onNext = {
             groupAccountViewModel.makeGroupAccount {
-                navController.navigate(Const.GROUP_ACCOUNT_COMPLETED)
+                navController.navigate(Const.GROUP_ACCOUNT_COMPLETED){
+                    popUpTo(Const.GROUP_ACCOUNT_MAIN_SCREEN)
+                }
             }
         }
     )

android/app/src/main/java/com/finance/android/ui/screens/groupAccount/DuesMemberListScreen.kt

@@ -108,7 +108,9 @@ fun DuesMemberListScreen(
                             groupAccountViewModel.makeGroupDues(
                                 createDuesRequestDto,
                                 onSuccess = {
-                                    navController.navigate(Const.GROUP_ACCOUNT_COMPLETED)
+                                    navController.navigate(Const.GROUP_ACCOUNT_COMPLETED){
+                                        popUpTo(Const.GROUP_ACCOUNT_DETAIL_SCREEN)
+                                    }
                                     groupAccountViewModel.initList(groupAccountViewModel.list.size)
                                 }
                             )

android/app/src/main/java/com/finance/android/ui/screens/groupAccount/GroupAccountOKScreen.kt

@@ -28,7 +28,7 @@ import com.finance.android.viewmodels.GroupAccountViewModel
 fun GroupAccountOKScreen(
     navController: NavController,
     modifier: Modifier,
-    groupAccountViewModel : GroupAccountViewModel
+    groupAccountViewModel: GroupAccountViewModel
 ) {
     var text = groupAccountViewModel.OKtext.value
     val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.ic_done))
@@ -72,8 +72,13 @@ fun GroupAccountOKScreen(
         Spacer(modifier = Modifier.weight(1f))
         TextButton(
             onClick = {
-                navController.popBackStack(route = Const.GROUP_ACCOUNT_MAIN_SCREEN, inclusive = false)
-                  },
+                if (groupAccountViewModel.screenType.value != 0) {
+                    navController.navigate(Const.GROUP_ACCOUNT_DETAIL_SCREEN)
+                } else {
+                    navController.navigate(Const.GROUP_ACCOUNT_MAIN_SCREEN)
+                }
+
+            },
             text = "다음",
             buttonType = ButtonType.ROUNDED,
             modifier = Modifier.withBottomButton()

android/app/src/main/java/com/finance/android/ui/screens/groupAccount/GroupAccountVerifyMoneyScreen.kt

@@ -63,15 +63,19 @@ fun GroupAccountVerifyMoneyScreen(
                             duesVal = groupAccountViewModel.duesVal.value,
                             duesId = groupAccountViewModel.duesId.value
                         ), onSuccess = {
-                            navController.navigate(Const.GROUP_ACCOUNT_COMPLETED)
+                            navController.navigate(Const.GROUP_ACCOUNT_COMPLETED){
+                                popUpTo(Const.GROUP_ACCOUNT_DETAIL_SCREEN)
+                            }
                         })
                 } else if (groupAccountViewModel.screenType.value == 2) {
                     groupAccountViewModel.OKtext.value = "모두의 통장으로 입금 성공"
                     groupAccountViewModel.postDeposit(GroupDepositRequestDto(
                         paId = groupAccountViewModel.paId.value,
                         value = groupAccountViewModel.duesVal.value,
                     ), onSuccess = {
-                        navController.navigate(Const.GROUP_ACCOUNT_COMPLETED)
+                        navController.navigate(Const.GROUP_ACCOUNT_COMPLETED){
+                            popUpTo(Const.GROUP_ACCOUNT_DETAIL_SCREEN)
+                        }
                     })
                 } else if (groupAccountViewModel.screenType.value == 3) {
                     groupAccountViewModel.OKtext.value = "모두의 통장에서 출금 성공"
@@ -80,7 +84,9 @@ fun GroupAccountVerifyMoneyScreen(
                             paId = groupAccountViewModel.paId.value,
                             value = groupAccountViewModel.duesVal.value
                         ), onSuccess = {
-                            navController.navigate(Const.GROUP_ACCOUNT_COMPLETED)
+                            navController.navigate(Const.GROUP_ACCOUNT_COMPLETED){
+                                popUpTo(Const.GROUP_ACCOUNT_DETAIL_SCREEN)
+                            }
                         })
 
                 }