diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
index 2745ef851..0a668de44 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
@@ -42,8 +42,14 @@ import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.service.CashuProcessor
import com.vitorpamplona.amethyst.service.CashuToken
import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
+import com.vitorpamplona.amethyst.ui.note.CashuIcon
+import com.vitorpamplona.amethyst.ui.note.CopyIcon
+import com.vitorpamplona.amethyst.ui.note.ZapIcon
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size20dp
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.subtleBorder
import kotlinx.coroutines.Dispatchers
@@ -173,10 +179,13 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
) {
if (isRedeeming) {
LoadingAnimation()
+ } else {
+ ZapIcon(Size20dp, tint = Color.White)
}
+ Spacer(DoubleHorzSpacer)
Text(
- "⚡ Send to Zap Wallet",
+ stringResource(id = R.string.cashu_redeem_to_zap),
color = Color.White,
fontSize = 16.sp
)
@@ -200,7 +209,9 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
containerColor = MaterialTheme.colorScheme.primary
)
) {
- Text("\uD83E\uDD5C Open in Cashu Wallet", color = Color.White, fontSize = 16.sp)
+ CashuIcon(Size20Modifier)
+ Spacer(DoubleHorzSpacer)
+ Text(stringResource(id = R.string.cashu_redeem_to_cachu), color = Color.White, fontSize = 16.sp)
}
Spacer(modifier = StdHorzSpacer)
Button(
@@ -213,7 +224,9 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
containerColor = MaterialTheme.colorScheme.primary
)
) {
- Text("⎘ Copy ", color = Color.White, fontSize = 16.sp)
+ CopyIcon(Size20Modifier, Color.White)
+ Spacer(DoubleHorzSpacer)
+ Text(stringResource(id = R.string.cashu_copy_token), color = Color.White, fontSize = 16.sp)
}
Spacer(modifier = StdHorzSpacer)
}
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
index 90473697a..0d49582cf 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
@@ -6,6 +6,7 @@ import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Bolt
import androidx.compose.material.icons.filled.Cancel
import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material.icons.filled.DownloadForOffline
import androidx.compose.material.icons.filled.Downloading
import androidx.compose.material.icons.filled.ExpandLess
@@ -175,6 +176,26 @@ fun ZapIcon(modifier: Modifier, tint: Color = Color.Unspecified) {
)
}
+@Composable
+fun CashuIcon(modifier: Modifier) {
+ Icon(
+ painter = painterResource(R.drawable.cashu),
+ "Cashu",
+ tint = Color.Unspecified,
+ modifier = modifier
+ )
+}
+
+@Composable
+fun CopyIcon(modifier: Modifier, tint: Color = Color.Unspecified) {
+ Icon(
+ imageVector = Icons.Default.ContentCopy,
+ stringResource(id = R.string.copy_to_clipboard),
+ tint = tint,
+ modifier = modifier
+ )
+}
+
@Composable
fun ExpandLessIcon(modifier: Modifier) {
Icon(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88b3b25e0..e2115edb0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -470,6 +470,10 @@
Payment
Cashu Token
Redeem
+ Send to Zap Wallet
+ Open in Cashu Wallet
+ Copy Token
+
No Lightning Address set
Copied token to clipboard
@@ -558,6 +562,7 @@
Show URL previews
When to load images
+ Copy to clipboard
Copy URL to clipboard
Copy Note ID to clipboard