Replace getEthAddressForAccount with fallbackEthAddress helper function

src/app/utils/__tests__/getEthAccountAddressFromPreimage.test.ts

@@ -0,0 +1,14 @@
+import { getEthAccountAddressFromPreimage } from '../helpers'
+import { suggestedEmptyAccount, suggestedParsedAccount } from '../test-fixtures'
+
+describe('getEthAccountAddressFromPreimage', () => {
+  it('should convert preimage to evm addresses', () => {
+    expect(getEthAccountAddressFromPreimage(suggestedParsedAccount.address_preimage)).toEqual(
+      suggestedParsedAccount.address_eth,
+    )
+  })
+
+  it('should return undefined on empty account', () => {
+    expect(getEthAccountAddressFromPreimage(suggestedEmptyAccount.address_preimage)).toBeUndefined()
+  })
+})

src/app/utils/helpers.ts

@@ -3,7 +3,7 @@ import { Buffer } from 'buffer'
 import * as oasis from '@oasisprotocol/client'
 import * as oasisRT from '@oasisprotocol/client-rt'
 // eslint-disable-next-line no-restricted-imports
-import { AddressPreimage, RuntimeAccount } from '../../oasis-nexus/generated/api'
+import { AddressPreimage } from '../../oasis-nexus/generated/api'
 import { validateMnemonic } from 'bip39'
 import { sha512_256 } from 'js-sha512'
 
@@ -94,16 +94,6 @@ export function getEthAccountAddressFromPreimage(preimage: AddressPreimage | und
   return getEthAccountAddressFromBase64(preimage.address_data)
 }
 
-export function getEthAddressForAccount(
-  account: RuntimeAccount,
-  possibleEthAddress?: string,
-): string | undefined {
-  // In case of an empty account
-  if (possibleEthAddress && isValidEthAddress(possibleEthAddress)) return possibleEthAddress
-
-  return getEthAccountAddressFromPreimage(account.address_preimage)
-}
-
 export function uniq<T>(input: T[] | undefined): T[] {
   return input === undefined ? [] : [...new Set(input)]
 }

src/oasis-nexus/api.ts

@@ -18,7 +18,7 @@ import {
 } from './generated/api'
 import {
   getAccountSize,
-  getEthAddressForAccount,
+  getEthAccountAddressFromPreimage,
   getOasisAddressOrNull,
   isValidEthAddress,
 } from '../app/utils/helpers'
@@ -448,7 +448,9 @@ export const useGetRuntimeAccountsAddress: typeof generated.useGetRuntimeAccount
           if (status !== 200) return data
           return groupAccountTokenBalances({
             ...data,
-            address_eth: getEthAddressForAccount(data, address),
+            address_eth:
+              getEthAccountAddressFromPreimage(data.address_preimage) ||
+              fallbackEthAddress(data.address, address),
             evm_contract: data.evm_contract && {
               ...data.evm_contract,
               eth_creation_tx: data.evm_contract.eth_creation_tx