Skip to content

Commit fa8a61e

Browse files
committed
Merge remote-tracking branch 'origin/main' into HEAD
* origin/main: chore(home): tighten up action badging fix(history): use notifications chat type for deriving balance unread count
2 parents 1637f3d + cdfa14f commit fa8a61e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

api/src/main/java/com/getcode/network/ChatHistoryController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ChatHistoryController @Inject constructor(
116116
chatFlows[chatId] = it
117117
}
118118

119-
val unreadCount = chats
119+
val unreadCount = notifications
120120
.filterNotNull()
121121
// Ignore muted chats and unsubscribed chats
122122
.map { it.filter { c -> !c.isMuted && c.isSubscribed } }

app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ internal fun HomeBottom(
7878
onClick = { onPress(HomeAction.BALANCE) },
7979
badge = {
8080
Badge(
81-
modifier = Modifier.padding(top = 2.dp, end = 2.dp),
81+
modifier = Modifier.padding(top = 6.dp, end = 1.dp),
8282
count = state.chatUnreadCount,
8383
color = ChatNodeDefaults.UnreadIndicator,
8484
enterTransition = scaleIn(
@@ -177,7 +177,7 @@ private fun BottomBarAction(
177177
actionPlaceable?.placeRelative(0, 0)
178178
badgePlaceable?.placeRelative(
179179
x = maxWidth - widthOrZero(badgePlaceable),
180-
y = -(heightOrZero(badgePlaceable) / 2)
180+
y = -(heightOrZero(badgePlaceable) / 3)
181181
)
182182
}
183183
}

0 commit comments

Comments
 (0)