Skip to content

Commit

Permalink
Merge pull request #500 from code-payments/develop
Browse files Browse the repository at this point in the history
v2.1.7 (412)
  • Loading branch information
jeffyanta authored Aug 7, 2024
2 parents 6472db5 + ca68794 commit 6f4139b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
13 changes: 9 additions & 4 deletions app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import coil3.compose.AsyncImage
import coil3.compose.LocalPlatformContext
import coil3.request.ImageRequest
import coil3.request.error
import com.getcode.LocalBetaFlags
import com.getcode.R
import com.getcode.model.chat.Chat
import com.getcode.model.chat.MessageContent
Expand All @@ -49,6 +50,8 @@ fun ChatNode(
chat: Chat,
onClick: () -> Unit,
) {
val betaFlags = LocalBetaFlags.current

Row(
modifier = modifier
.rememberedClickable { onClick() }
Expand All @@ -59,11 +62,13 @@ fun ChatNode(
horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x3),
verticalAlignment = Alignment.CenterVertically
) {
val imageModifier = Modifier
.size(CodeTheme.dimens.staticGrid.x10)
.clip(CircleShape)
if (betaFlags.tipsChatEnabled) {
val imageModifier = Modifier
.size(CodeTheme.dimens.staticGrid.x10)
.clip(CircleShape)

UserAvatar(modifier = imageModifier, data = chat.imageData)
UserAvatar(modifier = imageModifier, data = chat.imageData)
}

Column(
modifier = Modifier.weight(1f),
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ object Packaging {
private const val majorVersion = 2
private const val minorVersion = 1
private const val patchVersion = 7
const val buildNumber = 411
private const val buildNumber = 412

val versionCode = buildNumber
val versionName = "$majorVersion.$minorVersion.$patchVersion"
const val versionCode = buildNumber
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
}

object Versions {
Expand Down

0 comments on commit 6f4139b

Please sign in to comment.