fix: strip pubky prefix from truncated contact keys

app/src/main/java/to/bitkit/models/PubkyProfile.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import to.bitkit.ext.ellipsisMiddle
 import com.synonym.paykit.PaykitProfile as SdkPaykitProfile
 import com.synonym.paykit.PubkyProfile as SdkPubkyProfile
 
@@ -24,8 +23,6 @@ data class PubkyProfile(
     val status: String?,
 ) {
     companion object {
-        private const val TRUNCATED_PK_LENGTH = 11
-
         fun fromPubkyProfile(publicKey: String, sdkProfile: SdkPubkyProfile): PubkyProfile {
             return PubkyProfile(
                 publicKey = publicKey,
@@ -43,7 +40,7 @@ data class PubkyProfile(
 
         fun placeholder(publicKey: String) = PubkyProfile(
             publicKey = publicKey,
-            name = publicKey.ellipsisMiddle(TRUNCATED_PK_LENGTH),
+            name = PubkyPublicKeyFormat.display(publicKey),
             bio = "",
             imageUrl = null,
             links = emptyList(),
@@ -57,7 +54,7 @@ data class PubkyProfile(
             imageUrl: String?,
         ) = PubkyProfile(
             publicKey = publicKey,
-            name = name ?: publicKey.ellipsisMiddle(TRUNCATED_PK_LENGTH),
+            name = name ?: PubkyPublicKeyFormat.display(publicKey),
             bio = "",
             imageUrl = imageUrl,
             links = emptyList(),

app/src/main/java/to/bitkit/models/PubkyPublicKeyFormat.kt

@@ -15,6 +15,9 @@ object PubkyPublicKeyFormat {
     private const val redactedLength = 16
     const val maximumInputLength = 57
 
+    /** Prefixes stripped from a key before it is shortened for display. */
+    private val displayPrefixes = listOf("pubky", "pk:")
+
     fun bounded(input: String): String {
         return input
             .trim()
@@ -40,7 +43,7 @@ object PubkyPublicKeyFormat {
     }
 
     fun display(input: String): String {
-        val rawKey = bounded(input).removePrefix("pubky")
+        val rawKey = displayPrefixes.fold(bounded(input)) { key, prefix -> key.removePrefix(prefix) }
         return if (rawKey.length > displayEdgeLength * 2) {
             "${rawKey.take(displayEdgeLength)}...${rawKey.takeLast(displayEdgeLength)}"
         } else {

app/src/main/java/to/bitkit/ui/screens/profile/PubkyAuthApprovalSheet.kt

@@ -457,7 +457,7 @@ private fun ColumnScope.SuccessContent(
 
     SuccessDescriptionText(
         serviceName = uiState.serviceName,
-        truncatedKey = uiState.profile?.authDisplayPublicKey.orEmpty(),
+        truncatedKey = uiState.profile?.truncatedPublicKey.orEmpty(),
     )
     VerticalSpacer(16.dp)
 
@@ -558,7 +558,7 @@ private fun ProfileCard(profile: PubkyProfile) {
             .padding(24.dp),
     ) {
         Text13Up(
-            text = profile.authDisplayPublicKey,
+            text = profile.truncatedPublicKey,
             color = Colors.White64,
         )
         VerticalSpacer(16.dp)
@@ -591,14 +591,6 @@ private fun ProfileCard(profile: PubkyProfile) {
     }
 }
 
-private val PubkyProfile.authDisplayPublicKey: String
-    get() = pubkyAuthDisplayPublicKey(publicKey)
-
-internal fun pubkyAuthDisplayPublicKey(publicKey: String): String {
-    val rawKey = publicKey.removePrefix("pubky")
-    return if (rawKey.length > 8) "${rawKey.take(4)}...${rawKey.takeLast(4)}" else rawKey
-}
-
 @Preview(showSystemUi = true)
 @Composable
 private fun WatchOnlyConsentPreview() {

app/src/test/java/to/bitkit/models/PubkyPublicKeyFormatTest.kt

@@ -61,9 +61,31 @@ class PubkyPublicKeyFormatTest {
         assertEquals("3rsd...yw5x", PubkyPublicKeyFormat.display(key))
     }
 
+    @Test
+    fun `display never shows the pubky prefix`() {
+        val display = PubkyPublicKeyFormat.display("pubkydeadbeef3rsduhcxpw74snwyct86m38c63j3pq8x4ycqxyo1")
+
+        assertEquals("dead...xyo1", display)
+        assertFalse(display.startsWith("pubky"))
+    }
+
+    @Test
+    fun `display strips a pk prefix`() {
+        assertEquals("dead...xyo1", PubkyPublicKeyFormat.display("pk:deadbeef3rsduhcxpw74snwyct86m38c63j3pq8x4ycqxyo1"))
+    }
+
+    @Test
+    fun `display shortens an unprefixed key`() {
+        assertEquals("dead...xyo1", PubkyPublicKeyFormat.display("deadbeef3rsduhcxpw74snwyct86m38c63j3pq8x4ycqxyo1"))
+    }
+
     @Test
     fun `display leaves a short raw key unchanged`() {
         assertEquals("short", PubkyPublicKeyFormat.display("pubkyshort"))
+        assertEquals("short", PubkyPublicKeyFormat.display("pk:short"))
+        assertEquals("short", PubkyPublicKeyFormat.display("short"))
+        assertEquals("01234567", PubkyPublicKeyFormat.display("pubky01234567"))
+        assertEquals("", PubkyPublicKeyFormat.display("pubky"))
     }
 
     @Test

app/src/test/java/to/bitkit/ui/screens/profile/PubkyAuthApprovalViewModelTest.kt

@@ -204,12 +204,6 @@ class PubkyAuthApprovalViewModelTest : BaseUnitTest() {
         verifyBlocking(pubkyRepo, never()) { approveAuthWithCompanionClaim(any(), any(), any()) }
     }
 
-    @Test
-    fun `auth display public key omits pubky prefix`() {
-        assertEquals("3rsd...w5xg", pubkyAuthDisplayPublicKey("pubky3rsd123456789w5xg"))
-        assertEquals("3rsd...w5xg", pubkyAuthDisplayPublicKey("3rsd123456789w5xg"))
-    }
-
     @Test
     fun `confirmAuthorize is ignored when load has not completed`() = test {
         val authUrl = "pubkyauth://signin?caps=/pub/bitkit.to/:rw"

changelog.d/next/1456.fixed.md

@@ -0,0 +1 @@
+Shortened contact keys in payment sheets and auth prompts now omit the pubky prefix.