show name derivation index as well in list

src/Simplex/Chat/Controller.hs

@@ -861,7 +861,7 @@ data ChatResponse
   | CRNameInfo {user :: User, regName :: Text, regOwner :: Text, regPath :: Text, nameContact :: [Text], nameChannel :: [Text], regExpiry :: UTCTime, nameEditsLeft :: Word32}
   | CRNameLinkSet {user :: User, regName :: Text, nameRecord :: Text, regTxHash :: TxHash}
   | CRNameRescan {user :: User, namesFound :: [(Text, Text)]}
-  | CRNameKeys {user :: User, walletKeys :: [(Int, [(Maybe AccountIndex, [(Text, Text)])], Bool, Bool)]}
+  | CRNameKeys {user :: User, walletKeys :: [(Int, [(Maybe AccountIndex, [(Maybe NameIndex, Text, Text)])], Bool, Bool)]}
   | CRNameKeyPhrases {user :: User, walletPhrases :: [(Int, Text, [Text])]}
   | CRUserAcceptedGroupSent {user :: User, groupInfo :: GroupInfo, hostContact :: Maybe Contact}
   | CRUserDeletedMembers {user :: User, groupInfo :: GroupInfo, members :: [GroupMember], withMessages :: Bool, msgSigned :: Bool}

src/Simplex/Chat/Library/Commands.hs

@@ -66,7 +66,7 @@ import Simplex.Chat.Names.Protocol
 import Simplex.Chat.Names.Snrc (Intent (..), SnrcDeployment (..), intent712, parseRecordKey)
 import Simplex.Messaging.Eth.Address (Address, mkAddress)
 import Simplex.Chat.Store.Wallets (bindSeedAccount, boundAccount, createSeed, currentSeed, getNameKeys, getOrCreateAccountRef, listSeeds, markBackedUp, nameKeyPathTaken, raiseNextAccountIndex, raiseNextNameIndex, recordNameKey, seedOfName, setCurrentSeed, setNextNameIndex, takeNameIndex)
-import Simplex.Chat.Wallet (AccountIndex, AccountRef (..), SeedId, WalletAccount, WalletSeed (..), accountAddress, deriveAtPath, deriveNameKey, ethSignatureBytes, importRecoveryKey, newSeed, parseNameKeyPath, recoveryKeyPhrase, renderNameKeyPath, signIntent)
+import Simplex.Chat.Wallet (AccountIndex, AccountRef (..), NameIndex, SeedId, WalletAccount, WalletSeed (..), accountAddress, deriveAtPath, deriveNameKey, ethSignatureBytes, importRecoveryKey, newSeed, parseNameKeyPath, recoveryKeyPhrase, renderNameKeyPath, signIntent)
 import Simplex.Chat.Call
 import Simplex.Chat.Controller
 import Simplex.Chat.Delivery (DeliveryJobScope (..), DeliveryJobSpec (..), DeliveryWorkerScope (..))
@@ -5246,13 +5246,18 @@ deriveNameOwner user = do
           taken <- withFastStore' $ \db -> nameKeyPathTaken db sId path
           if taken then freeNameIndex sId acctIx (tries + 1) else pure (nameIx, path)
 
--- | Names a seed owns, grouped by the account they were derived under. Names on
--- a layout that is not ours have no account of ours and group under Nothing.
-groupByAccount :: [(Text, Text)] -> [(Maybe AccountIndex, [(Text, Text)])]
+-- | Names a seed owns, grouped by the account they were derived under and
+-- carrying the name index within it — the two numbers @\/name keys use@ takes.
+-- Names on a layout that is not ours have neither, and group under Nothing.
+groupByAccount :: [(Text, Text)] -> [(Maybe AccountIndex, [(Maybe NameIndex, Text, Text)])]
 groupByAccount ns =
   -- stable, so the accounts keep their order and the ungrouped names sort last
-  sortOn (isNothing . fst) . M.toAscList . M.fromListWith (flip (<>)) $
-    map (\(n, path) -> (fst <$> parseNameKeyPath path, [(n, path)])) ns
+  map (fmap (sortOn (\(ix_, _, _) -> ix_))) . sortOn (isNothing . fst) . M.toAscList . M.fromListWith (flip (<>)) $
+    map entry ns
+  where
+    entry (n, path) = case parseNameKeyPath path of
+      Just (acctIx, nameIx) -> (Just acctIx, [(Just nameIx, n, path)])
+      Nothing -> (Nothing, [(Nothing, n, path)])
 
 -- | Names this device holds a key for, with the path each key sits at.
 ownedNames :: User -> CM [(Text, Text)]

src/Simplex/Chat/View.hs

@@ -232,13 +232,18 @@ chatResponseToView hu cfg@ChatConfig {logLevel, showReactions, showFullLinks, te
   -- the phrase, so after importing on a new device this listing is what tells
   -- the user which account to pin a profile back to.
   CRNameKeys u rows ->
-    let name acct (n, path) = if isJust acct then n else n <> " (" <> path <> ")"
-        accountRow (acct, ns) =
+    let pad w t = t <> T.replicate (max 1 (w - T.length t)) " "
+        -- the index is shown because it is the third argument of
+        -- /name keys use; a name on a foreign layout has none, so it shows the
+        -- path that replaces it
+        nameRow (ix_, n, path) =
           plain $
-            "     "
-              <> maybe "other    " (\a -> "account " <> tshow a) acct
-              <> "   "
-              <> T.intercalate ", " (map (name acct) ns)
+            "       "
+              <> pad 9 (maybe "" (\ix -> "name " <> tshow ix) ix_)
+              <> n
+              <> maybe ("   " <> path) (const "") ix_
+        accountRow (acct, ns) =
+          plain ("     " <> maybe "other" (\a -> "account " <> tshow a) acct) : map nameRow ns
         keyRow (i, groups, cur, backed) =
           plain
             ( tshow i
@@ -246,7 +251,7 @@ chatResponseToView hu cfg@ChatConfig {logLevel, showReactions, showFullLinks, te
                 <> (if cur then "  (in use)" else "")
                 <> (if backed then "" else "  (not written down)")
             )
-            : if null groups then ["     no names yet"] else map accountRow groups
+            : if null groups then ["     no names yet"] else concatMap accountRow groups
      in ttyUser u $ case rows of
           [] -> ["no recovery keys yet - one is created when you buy a name"]
           _ -> concatMap keyRow rows