Merge branch 'develop' into feature/155_improvement_navigation

team-xquare · Jun 22, 2023 · 9dc49bf · 9dc49bf
2 parents d904e17 + 4fa02b6
commit 9dc49bf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/main/java/com/xquare/xquare_android/feature/alarm/AlarmScreen.kt b/app/src/main/java/com/xquare/xquare_android/feature/alarm/AlarmScreen.kt
@@ -123,7 +123,7 @@ fun AlarmItem(
         daysDifference > 0 -> "${daysDifference}일 전"
         hoursDifference <= 0 ->"${minutesDifference}분 전"
         else -> "${hoursDifference}시간 전"
-    }
+    }.let { if (it == "0분 전") "방금전" else it }
 
     val tint = if (alarmList.is_read) black else purple300