show to nickname in sign prompt

internal/handler/wallet/sign.go

@@ -43,22 +43,23 @@ const (
 )
 
 type PromptRequestSignData struct {
-	Description      string
-	Fees             string
-	OperationType    string
-	OperationID      uint64
-	Coins            string
-	Address          string
-	Function         string
-	MaxCoins         string
-	MaxGas           string
-	Expiry           uint64
-	WalletAddress    string
-	Nickname         string
-	RollCount        uint64
-	RecipientAddress string
-	Amount           string
-	PlainText        string
+	Description       string
+	Fees              string
+	OperationType     string
+	OperationID       uint64
+	Coins             string
+	Address           string
+	Function          string
+	MaxCoins          string
+	MaxGas            string
+	Expiry            uint64
+	WalletAddress     string
+	Nickname          string
+	RollCount         uint64
+	RecipientAddress  string
+	RecipientNickname string
+	Amount            string
+	PlainText         string
 }
 
 // NewSign instantiates a sign Handler
@@ -258,8 +259,7 @@ func (w *walletSign) getPromptRequest(msgToSign string, acc *account.Account, de
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to decode plainText message from b64")
 			}
-			promptRequest = w.prepareplainTextPromptRequest(string(decodedMsg), acc, address, description)
-
+			promptRequest = w.preparePlainTextPromptRequest(string(decodedMsg), acc, address, description)
 		}
 	}
 
@@ -356,23 +356,33 @@ func (w *walletSign) prepareTransactionPromptRequest(
 	fees uint64,
 	expiry uint64,
 ) prompt.PromptRequest {
+	var recipientNickname string
+
+	recipientAcc, err := w.prompterApp.App().Wallet.GetAccountFromAddress(msg.RecipientAddress)
+	if err != nil {
+		recipientNickname = ""
+	} else {
+		recipientNickname = recipientAcc.Nickname
+	}
+
 	return prompt.PromptRequest{
 		Action: walletapp.Sign,
 		Msg:    fmt.Sprintf("Unprotect wallet %s", acc.Nickname),
 		Data: PromptRequestSignData{
-			Description:      description,
-			Fees:             strconv.FormatUint(fees, 10),
-			OperationType:    "Transaction",
-			RecipientAddress: msg.RecipientAddress,
-			Amount:           strconv.FormatUint(msg.Amount, 10),
-			Expiry:           expiry,
-			WalletAddress:    address,
-			Nickname:         acc.Nickname,
+			Description:       description,
+			Fees:              strconv.FormatUint(fees, 10),
+			OperationType:     "Transaction",
+			RecipientAddress:  msg.RecipientAddress,
+			RecipientNickname: recipientNickname,
+			Amount:            strconv.FormatUint(msg.Amount, 10),
+			Expiry:            expiry,
+			WalletAddress:     address,
+			Nickname:          acc.Nickname,
 		},
 	}
 }
 
-func (s *walletSign) prepareplainTextPromptRequest(
+func (s *walletSign) preparePlainTextPromptRequest(
 	plainText string,
 	acc *account.Account,
 	address string,

internal/handler/wallet/transfer.go

@@ -51,16 +51,26 @@ func (t *transferCoin) Handle(params operations.TransferCoinParams) middleware.R
 	}
 	address := string(addressBytes)
 
+	var recipientNickname string
+
+	recipientAcc, err := t.prompterApp.App().Wallet.GetAccountFromAddress(*params.Body.RecipientAddress)
+	if err != nil {
+		recipientNickname = ""
+	} else {
+		recipientNickname = recipientAcc.Nickname
+	}
+
 	promptRequest := prompt.PromptRequest{
 		Action: walletapp.Sign,
 		Msg:    fmt.Sprintf("Unprotect wallet %s", acc.Nickname),
 		Data: PromptRequestSignData{
-			Fees:             string(params.Body.Fee),
-			OperationType:    "Transaction",
-			RecipientAddress: *params.Body.RecipientAddress,
-			Amount:           string(params.Body.Amount),
-			WalletAddress:    address,
-			Nickname:         acc.Nickname,
+			Fees:              string(params.Body.Fee),
+			OperationType:     "Transaction",
+			RecipientAddress:  *params.Body.RecipientAddress,
+			RecipientNickname: recipientNickname,
+			Amount:            string(params.Body.Amount),
+			WalletAddress:     address,
+			Nickname:          acc.Nickname,
 		},
 	}
 

pkg/wallet/wallet.go

@@ -169,6 +169,21 @@ func (w *Wallet) GetAccount(nickname string) (*account.Account, error) {
 	return acc, nil
 }
 
+func (w *Wallet) GetAccountFromAddress(needle string) (*account.Account, error) {
+	for _, acc := range w.accounts {
+		address, err := acc.Address.MarshalText()
+		if err != nil {
+			return nil, err
+		}
+
+		if needle == string(address) {
+			return acc, nil
+		}
+	}
+
+	return nil, AccountNotFoundError
+}
+
 // Delete an account from the wallet
 func (w *Wallet) DeleteAccount(nickname string) error {
 	if w.accounts[nickname] == nil {

wails-frontend/src/pages/PasswordPromptHandler/ExecuteSC.tsx/ExecuteSc.tsx

@@ -2,7 +2,13 @@ import { WindowSetSize } from '@wailsjs/runtime/runtime';
 
 import { PromptRequestData } from '../Sign';
 import Intl from '@/i18n/i18n';
-import { formatStandard, masToken, maskAddress, Unit } from '@/utils';
+import {
+  formatStandard,
+  masToken,
+  maskAddress,
+  Unit,
+  maskNickname,
+} from '@/utils';
 
 export function ExecuteSC(props: PromptRequestData) {
   const {
@@ -22,7 +28,7 @@ export function ExecuteSC(props: PromptRequestData) {
       <div className="flex w-full justify-between">
         <p>{Intl.t('password-prompt.sign.from')}</p>
         <div className="flex flex-col">
-          <p className="mas-menu-default">{Nickname}</p>
+          <p className="mas-menu-default">{maskNickname(Nickname)}</p>
           <p className="mas-caption">{maskAddress(WalletAddress)}</p>
         </div>
       </div>

wails-frontend/src/pages/PasswordPromptHandler/PlainText/PlainText.tsx

@@ -4,7 +4,7 @@ import { FiChevronDown, FiChevronUp, FiInfo } from 'react-icons/fi';
 
 import { PromptRequestData } from '../Sign';
 import Intl from '@/i18n/i18n';
-import { maskAddress } from '@/utils';
+import { maskAddress, maskNickname } from '@/utils';
 
 export function PlainText(props: PromptRequestData) {
   const { PlainText, DisplayData, WalletAddress, Description, Nickname } =
@@ -23,7 +23,7 @@ export function PlainText(props: PromptRequestData) {
       <div className="flex w-full justify-between">
         <p>{Intl.t('password-prompt.sign.from')}</p>
         <div className="flex flex-col">
-          <p className="mas-menu-default">{Nickname}</p>
+          <p className="mas-menu-default">{maskNickname(Nickname)}</p>
           <p className="mas-caption">{maskAddress(WalletAddress)}</p>
         </div>
       </div>

wails-frontend/src/pages/PasswordPromptHandler/Sign.tsx

@@ -47,6 +47,7 @@ export interface PromptRequestData {
   Expiry: number;
   RollCount: number;
   RecipientAddress: string;
+  RecipientNickname: string;
   Amount: string;
   PlainText: string;
   DisplayData: boolean;

wails-frontend/src/pages/PasswordPromptHandler/SignSC/CallSc.tsx

@@ -9,7 +9,13 @@ import {
 
 import { PromptRequestData } from '../Sign';
 import Intl from '@/i18n/i18n';
-import { formatStandard, masToken, maskAddress, Unit } from '@/utils';
+import {
+  formatStandard,
+  masToken,
+  maskAddress,
+  Unit,
+  maskNickname,
+} from '@/utils';
 
 export function CallSc(props: PromptRequestData) {
   const {
@@ -40,7 +46,7 @@ export function CallSc(props: PromptRequestData) {
             <p className="mas-menu-active">
               {Intl.t('password-prompt.sign.from')}
             </p>
-            <p className="mas-menu-default">{Nickname}</p>
+            <p className="mas-menu-default">{maskNickname(Nickname)}</p>
           </div>
           <p className="mas-caption">{maskAddress(WalletAddress)}</p>
         </div>

wails-frontend/src/pages/PasswordPromptHandler/Transaction/Transaction.tsx

@@ -3,12 +3,19 @@ import { FiArrowRight } from 'react-icons/fi';
 
 import { PromptRequestData } from '../Sign';
 import Intl from '@/i18n/i18n';
-import { formatStandard, masToken, maskAddress, Unit } from '@/utils';
+import {
+  formatStandard,
+  masToken,
+  maskAddress,
+  Unit,
+  maskNickname,
+} from '@/utils';
 
 export function Transaction(props: PromptRequestData) {
   const {
     WalletAddress,
     RecipientAddress,
+    RecipientNickname,
     OperationType,
     Amount,
     Fees,
@@ -26,15 +33,24 @@ export function Transaction(props: PromptRequestData) {
             <p className="mas-menu-active">
               {Intl.t('password-prompt.sign.from')}
             </p>
-            <p className="mas-menu-default">{Nickname}</p>
+            <p className="mas-menu-default">{maskNickname(Nickname)}</p>
           </div>
           <p className="mas-caption">{maskAddress(WalletAddress)}</p>
         </div>
         <div className="h-8 w-8 rounded-full flex items-center justify-center bg-neutral">
           <FiArrowRight size={24} className="text-primary" />
         </div>
         <div className="flex flex-col">
-          <p className="mas-menu-active">{Intl.t('password-prompt.sign.to')}</p>
+          <div className="flex gap-2">
+            <p className="mas-menu-active">
+              {Intl.t('password-prompt.sign.to')}
+            </p>
+            {RecipientAddress ? (
+              <p className="mas-menu-default">
+                {maskNickname(RecipientNickname)}
+              </p>
+            ) : null}
+          </div>
           <p className="mas-caption">{maskAddress(RecipientAddress)}</p>
         </div>
       </div>

wails-frontend/src/utils/massaFormat.tsx

@@ -92,3 +92,11 @@ export function maskAddress(str: string, length = 4, mask = '. . .'): string {
 
   return str ? str?.substring(0, start) + mask + str?.substring(end) : '';
 }
+
+export function maskNickname(str: string, length = 10): string {
+  if (!str) return '';
+
+  if (str.length <= length) return str;
+
+  return str?.substring(0, length) + '...';
+}