fix: display full return address or the account if viewable

In pcli view tx, we should show the full address if its opaque,
since we might want to send funds back to the sender, or, if we
can view, show which of our accounts the tx was sent from.

crates/bin/pcli/src/command/view/tx.rs

@@ -190,6 +190,16 @@ fn format_address(ivk: &IncomingViewingKey, address: &Address) -> String {
     }
 }
 
+fn format_full_address(ivk: &IncomingViewingKey, address: &Address) -> String {
+    if ivk.views_address(address) {
+        let account = ivk.index_for_diversifier(address.diversifier()).account;
+
+        format!("[account {account:?}]")
+    } else {
+        format!("{}", address)
+    }
+}
+
 fn format_position_row(asset_cache: &Cache, position: Position) -> String {
     let trading_pair = position.phi.pair;
     let denom_1 = asset_cache
@@ -431,8 +441,11 @@ impl TxCmd {
                         ciphertext: _,
                     } => {
                         metadata_table.add_row(vec![
-                            "Transaction Memo Sender",
-                            &plaintext.return_address.address().to_string(),
+                            "Transaction Memo Return Address",
+                            &format_full_address(
+                                fvk.incoming(),
+                                &plaintext.return_address.address(),
+                            ),
                         ]);
                         metadata_table.add_row(vec!["Transaction Memo Text", &plaintext.text]);
                     }

crates/view/src/service.rs

@@ -809,7 +809,7 @@ impl ViewProtocolService for ViewService {
                     address_views.insert(address, fvk.view_address(address));
                     asset_ids.insert(note.asset_id());
 
-                    // Also add an AddressView for the sender address in the memo.
+                    // Also add an AddressView for the return address in the memo.
                     let memo = tx.decrypt_memo(&fvk).map_err(|_| {
                         tonic::Status::internal("Error decrypting memo for OutputView")
                     })?;

crates/wasm/src/tx.rs

@@ -275,7 +275,7 @@ pub async fn transaction_info_inner(
                 address_views.insert(address, fvk.view_address(address));
                 asset_ids.insert(note.asset_id());
 
-                // Also add an AddressView for the sender address in the memo.
+                // Also add an AddressView for the return address in the memo.
                 let memo = tx.decrypt_memo(&fvk)?;
                 address_views.insert(memo.return_address, fvk.view_address(address));
             }