From 9e185f75ea233ebb510f64b8be881c75d21a8e20 Mon Sep 17 00:00:00 2001
From: t1nm1ksun <minsuk07672@naver.com>
Date: Tue, 27 Aug 2024 21:26:01 +0900
Subject: [PATCH] =?UTF-8?q?[chore]=20#173=20=EB=A7=A4=ED=8D=BC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20=EC=82=AC=EC=9D=B4=EB=93=9C=20=EC=9D=B4=ED=8E=99?=
 =?UTF-8?q?=ED=8A=B8=20=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dateroad/data/mapper/todata/ProfileMapper.kt     | 12 +++++-------
 .../org/sopt/dateroad/domain/model/EditProfile.kt    |  2 +-
 .../presentation/ui/profile/ProfileScreen.kt         |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt
index 82769d1d1..05cb5cfe3 100644
--- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt
+++ b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt
@@ -3,10 +3,8 @@ package org.sopt.dateroad.data.mapper.todata
 import org.sopt.dateroad.domain.model.EditProfile
 import org.sopt.dateroad.domain.model.Profile
 
-fun Profile.toEditProfile(): EditProfile {
-    return EditProfile(
-        name = this.name,
-        tags = this.tag,
-        image = this.imageUrl ?: ""
-    )
-}
+fun Profile.toEditProfile(): EditProfile = EditProfile(
+    name = this.name,
+    tags = this.tag,
+    image = this.imageUrl
+)
diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt b/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt
index a6373dea0..6a09be0f6 100644
--- a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt
+++ b/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt
@@ -3,5 +3,5 @@ package org.sopt.dateroad.domain.model
 data class EditProfile(
     val name: String = "",
     val tags: List<String> = listOf(),
-    val image: String? = null
+    val image: String? = ""
 )
diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt
index 30211ab69..3e0a31577 100644
--- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt
+++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt
@@ -85,7 +85,7 @@ fun ProfileRoute(
                 when (profileSideEffect) {
                     is ProfileContract.ProfileSideEffect.NavigateToHome -> navigationToHome()
                     is ProfileContract.ProfileSideEffect.NavigateToMyPage -> navigationToMyPage()
-                    else -> {}
+                    is ProfileContract.ProfileSideEffect.PopBackStack -> popBackStack()
                 }
             }
     }
@@ -117,7 +117,6 @@ fun ProfileRoute(
 
                 )
             }
-
             LoadState.Loading -> DateRoadLoadingView()
             LoadState.Success -> navigationToHome()
             LoadState.Error -> DateRoadErrorView()