fix(wallet-utils): Fix getNetworkAccountFeatures fallback

trezor · Sep 26, 2024 · cdde4fd · cdde4fd
1 parent e25f9c2
commit cdde4fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts b/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts
@@ -217,11 +217,9 @@ describe('account utils', () => {
 
     it('getNetworkAccountFeatures', () => {
         const btcAcc = getWalletAccount({ symbol: 'btc' });
-
         const btcTaprootAcc = getWalletAccount({ symbol: 'btc', accountType: 'taproot' });
-
+        const btcLegacy = getWalletAccount({ symbol: 'btc', accountType: 'legacy' });
         const ethAcc = getWalletAccount();
-
         const coinjoinAcc = getWalletAccount({ symbol: 'regtest', accountType: 'coinjoin' });
 
         expect(getNetworkAccountFeatures(btcAcc)).toEqual(['rbf', 'sign-verify', 'amount-unit']);
@@ -235,6 +233,8 @@ describe('account utils', () => {
             'staking',
         ]);
         expect(getNetworkAccountFeatures(coinjoinAcc)).toEqual(['rbf', 'amount-unit']);
+        // when account does not have features defined, take them from root network object
+        expect(getNetworkAccountFeatures(btcLegacy)).toEqual(getNetworkAccountFeatures(btcAcc));
     });
 
     it('hasNetworkFeatures', () => {

diff --git a/suite-common/wallet-utils/src/accountUtils.ts b/suite-common/wallet-utils/src/accountUtils.ts
@@ -1065,9 +1065,7 @@ export const getNetworkAccountFeatures = ({
 }: Pick<Account, 'symbol' | 'accountType'>): NetworkFeature[] => {
     const matchedNetwork = getNetwork(symbol);
 
-    return accountType === 'normal'
-        ? matchedNetwork.features
-        : matchedNetwork.accountTypes[accountType]?.features ?? [];
+    return matchedNetwork.accountTypes[accountType]?.features ?? matchedNetwork.features;
 };
 
 export const hasNetworkFeatures = (