Merge branch 'accountnumber' into staging-send-to-self-dropdown

Author: benma

backend/handlers/handlers.go

@@ -400,6 +400,8 @@ type accountJSON struct {
 	IsToken               bool               `json:"isToken"`
 	ActiveTokens          []activeToken      `json:"activeTokens,omitempty"`
 	BlockExplorerTxPrefix string             `json:"blockExplorerTxPrefix"`
+	// Number of the account per coin per keystore, starting at 0. Nil if unknown.
+	AccountNumber *uint16 `json:"accountNumber"`
 }
 
 func newAccountJSON(
@@ -410,6 +412,11 @@ func newAccountJSON(
 	eth, ok := account.Coin().(*eth.Coin)
 	isToken := ok && eth.ERC20Token() != nil
 	watch := account.Config().Config.Watch
+	var accountNumberPtr *uint16
+	accountNumber, err := account.Config().Config.SigningConfigurations.AccountNumber()
+	if err == nil {
+		accountNumberPtr = &accountNumber
+	}
 	return &accountJSON{
 		Keystore: keystoreJSON{
 			Keystore:  keystore,
@@ -426,6 +433,7 @@ func newAccountJSON(
 		IsToken:               isToken,
 		ActiveTokens:          activeTokens,
 		BlockExplorerTxPrefix: account.Coin().BlockExplorerTransactionURLPrefix(),
+		AccountNumber:         accountNumberPtr,
 	}
 }
 

backend/signing/configuration.go

@@ -202,6 +202,15 @@ func (configuration *Configuration) String() string {
 // fingerprint.
 type Configurations []*Configuration
 
+// AccountNumber returns the first config's account number. It assumes all configurations have the
+// same account number.
+func (configs Configurations) AccountNumber() (uint16, error) {
+	for _, config := range configs {
+		return config.AccountNumber()
+	}
+	return 0, errp.New("no configs")
+}
+
 // RootFingerprint gets the fingerprint of the first config (assuming that all configurations have
 // the same rootFingerprint). Returns an error if the list has no entries or does not contain a
 // known config.

backend/signing/configuration_test.go

@@ -148,3 +148,20 @@ func TestAccountNumber(t *testing.T) {
 	require.Error(t, err)
 	require.Equal(t, uint16(0), num)
 }
+
+func TestAccountNumberOnConfigurations(t *testing.T) {
+	xpub, err := hdkeychain.NewMaster(make([]byte, 32), &chaincfg.TestNet3Params)
+	require.NoError(t, err)
+	xpub, err = xpub.Neuter()
+	require.NoError(t, err)
+	rootFingerprint := []byte{1, 2, 3, 4}
+
+	cfg1 := NewBitcoinConfiguration(
+		ScriptTypeP2WPKH, rootFingerprint, mustKeypath("m/48'/0'/10'"), xpub)
+	cfg2 := NewBitcoinConfiguration(
+		ScriptTypeP2WPKH, rootFingerprint, mustKeypath("m/84'/0'/10'"), xpub)
+	cfgs := Configurations{cfg1, cfg2}
+	num, err := cfgs.AccountNumber()
+	require.NoError(t, err)
+	require.Equal(t, uint16(10), num)
+}

frontends/web/src/api/account.ts

@@ -74,6 +74,7 @@ export interface IAccount {
   activeTokens?: IActiveToken[];
   blockExplorerTxPrefix: string;
   bitsuranceStatus?: TDetailStatus;
+  accountNumber?: number;
 }
 
 export const getAccounts = (): Promise<IAccount[]> => {

frontends/web/src/routes/account/send/components/confirm/confirm.tsx

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { CoinCode, ConversionUnit, FeeTargetCode, Fiat, IAccount, TAmountWithConversions } from '@/api/account';
 import { UseDisableBackButton } from '@/hooks/backbutton';
 import { Amount } from '@/components/amount/amount';
-import { customFeeUnit, getAccountNumber } from '@/routes/account/utils';
+import { customFeeUnit } from '@/routes/account/utils';
 import { View, ViewContent, ViewHeader } from '@/components/view/view';
 import { Message } from '@/components/message/message';
 import { PointToBitBox02 } from '@/components/icon';
@@ -45,7 +45,6 @@ type TConfirmSendProps = {
   selectedUTXOs: TSelectedUTXOs;
   coinCode: CoinCode;
   transactionDetails: TransactionDetails;
-  activeAccounts?: IAccount[];
 }
 
 type TUTXOsByAddress = {
@@ -60,10 +59,9 @@ export const ConfirmSend = ({
   selectedUTXOs,
   coinCode,
   transactionDetails,
-  activeAccounts: allAccounts
 }: TConfirmSendProps) => {
 
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   const {
     proposedFee,
     proposedAmount,
@@ -75,14 +73,10 @@ export const ConfirmSend = ({
     activeCurrency: fiatUnit
   } = transactionDetails;
 
-  const receiverAccountNumberAndName = selectedReceiverAccount && allAccounts ?
+  const receiverAccountNumberAndName = selectedReceiverAccount ?
     {
       name: selectedReceiverAccount.name,
-      number: getAccountNumber(
-        selectedReceiverAccount,
-        allAccounts,
-        i18n.language
-      )
+      number: selectedReceiverAccount.accountNumber ? selectedReceiverAccount.accountNumber + 1 : null,
     }
     : undefined;
 

frontends/web/src/routes/account/send/components/inputs/receiver-address-input.tsx

@@ -123,7 +123,6 @@ export const ReceiverAddressInput = ({
       ) : (
         <ReceiverAddressWrapper
           accounts={accountsForReceiverDropdown}
-          allAccounts={activeAccounts}
           error={addressError}
           onInputChange={onInputChange}
           onAccountChange={onAccountChange}

frontends/web/src/routes/account/send/components/inputs/receiver-address-wrapper.tsx

@@ -27,7 +27,6 @@ import { useMountedRef } from '@/hooks/mount';
 import { useMediaQuery } from '@/hooks/mediaquery';
 import { SpinnerRingAnimated } from '@/components/spinner/SpinnerAnimation';
 import { Logo } from '@/components/icon';
-import { getAccountNumber } from '@/routes/account/utils';
 import receiverStyles from './receiver-address-input.module.css';
 import styles from './receiver-address-wrapper.module.css';
 
@@ -40,7 +39,6 @@ type Props = {
 
 type TReceiverAddressWrapperProps = {
   accounts?: IAccount[];
-  allAccounts?: IAccount[];
   error?: string | object;
   onInputChange: (value: string) => void;
   onAccountChange?: (account: IAccount | null) => void;
@@ -68,24 +66,23 @@ const AccountOption = ({ option, isSelectedValue }: Props) => {
 
 export const ReceiverAddressWrapper = ({
   accounts,
-  allAccounts,
   error,
   onInputChange,
   onAccountChange,
   recipientAddress,
   children,
 }: TReceiverAddressWrapperProps) => {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
   const mounted = useMountedRef();
   const isMobile = useMediaQuery('(max-width: 768px)');
   const [selectedAccount, setSelectedAccount] = useState<TOption<IAccount | null> | null>(null);
   const [accountSyncStatus, setAccountSyncStatus] = useState<{ [code: string]: accountApi.IStatus }>({});
 
   const accountOptions: TAccountOption[] = accounts && accounts.length > 0 ? accounts.map(account => {
-    const accountNumber = getAccountNumber(account, allAccounts || accounts, i18n.language);
+    const accountNumber = account.accountNumber;
 
     return {
-      label: `${account.name} ${accountNumber ? `(Account #${accountNumber})` : ''}`,
+      label: `${account.name} ${accountNumber ? `(Account #${accountNumber + 1})` : ''}`,
       value: account,
       disabled: !accountSyncStatus[account.code]?.synced
     };

frontends/web/src/routes/account/send/send.tsx

@@ -488,7 +488,6 @@ export const Send = ({
                 recipientAddress: recipientInput,
                 activeCurrency,
               }}
-              activeAccounts={activeAccounts}
             />
             {sendResult && (
               <SendResult

frontends/web/src/routes/account/utils.ts

@@ -148,19 +148,3 @@ export const getAccountsPerCoin = (accounts: IAccount[]): TAccountCoinMap => {
     return accountPerCoin;
   }, {});
 };
-
-export const getAccountNumber = (targetAccount: IAccount, allAccounts: IAccount[], language: string): number | null => {
-  try {
-    const sameKeystoreAndCoin = allAccounts.filter(account =>
-      account.keystore.rootFingerprint === targetAccount.keystore.rootFingerprint &&
-      account.coinCode === targetAccount.coinCode
-    );
-
-    sameKeystoreAndCoin.sort((a, b) => a.code.localeCompare(b.code, language));
-    const position = sameKeystoreAndCoin.findIndex(account => account.code === targetAccount.code);
-    return position >= 0 ? position + 1 : null;
-  } catch (error) {
-    console.error('Error determining account number:', error);
-    return null;
-  }
-};