From 165678f118973934b1476099f17131d9d5ee4705 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 5 Jun 2023 18:22:09 -0400 Subject: [PATCH] formatting --- .../java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt | 2 +- .../com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt | 2 +- .../com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt index 1302e374e..5a183186a 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt @@ -40,7 +40,7 @@ import kotlinx.coroutines.launch @Composable fun ZapNoteCompose(baseReqResponse: ZapReqResponse, accountViewModel: AccountViewModel, nav: (String) -> Unit) { - val baseNoteRequest by baseReqResponse.request.live().metadata.observeAsState() + val baseNoteRequest by baseReqResponse.zapRequest.live().metadata.observeAsState() var baseAuthor by remember { mutableStateOf(null) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt index bed311747..1d1c9dc31 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt @@ -7,7 +7,7 @@ import com.vitorpamplona.amethyst.model.Note import kotlinx.collections.immutable.ImmutableList @Immutable -data class ZapReqResponse(val request: Note, val zapEvent: Note) +data class ZapReqResponse(val zapRequest: Note, val zapEvent: Note) @Stable sealed class LnZapFeedState { diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt b/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt index 8c84b0a83..db91f6b85 100644 --- a/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt +++ b/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt @@ -35,10 +35,10 @@ class UserZapsTest { val actual = UserZaps.forProfileFeed(zaps) Assert.assertEquals(1, actual.count()) - Assert.assertEquals(zapRequest, actual.first().first) + Assert.assertEquals(zapRequest, actual.first().zapRequest) Assert.assertEquals( BigDecimal(200), - (actual.first().second.event as LnZapEventInterface).amount() + (actual.first().zapEvent.event as LnZapEventInterface).amount() ) }