feat(wallet): Wallet accounts model improvements (#15213)

src/app/modules/main/browser_section/current_account/module.nim

@@ -50,6 +50,7 @@ proc switchAccount*(self: Module, accountIndex: int) =
   let keycardAccount = self.controller.isKeycardAccount(walletAccount)
   let currency = self.controller.getCurrentCurrency()
   let enabledChainIds = self.controller.getEnabledChainIds()
+  let chainIds = self.controller.getChainIds()
   let areTestNetworksEnabled = self.controller.areTestNetworksEnabled()
   let currencyFormat = self.controller.getCurrencyFormat(currency)
   let currencyBalance = self.controller.getTotalCurrencyBalance(walletAccount.address, enabledChainIds)
@@ -57,6 +58,8 @@ proc switchAccount*(self: Module, accountIndex: int) =
   let accountItem = walletAccountToWalletAccountsItem(
     walletAccount,
     keycardAccount,
+    chainIds,
+    enabledChainIds,
     currencyBalance,
     currencyFormat,
     areTestNetworksEnabled,

src/app/modules/main/wallet_section/accounts/controller.nim

@@ -74,3 +74,6 @@ proc updateWatchAccountHiddenFromTotalBalance*(self: Controller, address: string
 
 proc getTokensMarketValuesLoading*(self: Controller): bool =
   return self.walletAccountService.getTokensMarketValuesLoading()
+
+proc getChainIds*(self: Controller): seq[int] =
+  return self.networkService.getCurrentNetworks().map(n => n.chainId)

src/app/modules/main/wallet_section/accounts/item.nim

@@ -1,69 +1,127 @@
+import NimQml
 import ../../../shared_models/wallet_account_item
 import ../../../shared_models/currency_amount
 
 export wallet_account_item
 
-type
+QtObject:
-  Item* = ref object of WalletAccountItem
+  type Item* = ref object of WalletAccountItem
     createdAt: int
     assetsLoading: bool
     currencyBalance: CurrencyAmount
     isWallet: bool
+    canSend: bool
 
-proc initItem*(
+  proc setup*(self: Item,
-  name: string = "",
+    name: string,
-  address: string = "",
+    address: string,
-  path: string = "",
+    path: string,
-  colorId: string = "",
+    colorId: string,
-  walletType: string = "",
+    walletType: string,
-  currencyBalance: CurrencyAmount = nil,
+    currencyBalance: CurrencyAmount,
-  emoji: string = "",
+    emoji: string,
-  keyUid: string = "",
+    keyUid: string,
-  createdAt: int = 0,
+    createdAt: int,
-  position: int = 0,
+    position: int,
-  keycardAccount: bool = false,
+    keycardAccount: bool,
-  assetsLoading: bool = true,
+    assetsLoading: bool,
-  isWallet: bool = false,
+    isWallet: bool,
-  areTestNetworksEnabled: bool = false,
+    areTestNetworksEnabled: bool,
-  prodPreferredChainIds: string = "",
+    prodPreferredChainIds: string,
-  testPreferredChainIds: string = "",
+    testPreferredChainIds: string,
-  hideFromTotalBalance: bool = false
+    hideFromTotalBalance: bool,
-): Item =
+    canSend: bool
-  result = Item()
+  ) =
-  result.WalletAccountItem.setup(name,
+    self.QObject.setup
-    address,
+    self.WalletAccountItem.setup(name,
-    colorId,
+      address,
-    emoji,
+      colorId,
-    walletType,
+      emoji,
-    path,
+      walletType,
-    keyUid,
+      path,
-    keycardAccount,
+      keyUid,
-    position,
+      keycardAccount,
-    operability = wa_dto.AccountFullyOperable,
+      position,
-    areTestNetworksEnabled,
+      operability = wa_dto.AccountFullyOperable,
-    prodPreferredChainIds,
+      areTestNetworksEnabled,
-    testPreferredChainIds,
+      prodPreferredChainIds,
-    hideFromTotalBalance)
+      testPreferredChainIds,
-  result.createdAt = createdAt
+      hideFromTotalBalance)
-  result.assetsLoading = assetsLoading
+    self.createdAt = createdAt
-  result.currencyBalance = currencyBalance
+    self.assetsLoading = assetsLoading
-  result.isWallet = isWallet
+    self.currencyBalance = currencyBalance
+    self.isWallet = isWallet
+    self.canSend = canSend
 
-proc `$`*(self: Item): string =
+  proc delete*(self: Item) =
-  result = "WalletSection-Accounts-Item("
+    self.QObject.delete
-  result = result & $self.WalletAccountItem
-  result = result & "\nassetsLoading: " & $self.assetsLoading
-  result = result & "\ncurrencyBalance: " & $self.currencyBalance
-  result = result & ")"
 
-proc currencyBalance*(self: Item): CurrencyAmount =
+  proc newItem*(
-  return self.currencyBalance
+    name: string = "",
+    address: string = "",
+    path: string = "",
+    colorId: string = "",
+    walletType: string = "",
+    currencyBalance: CurrencyAmount = nil,
+    emoji: string = "",
+    keyUid: string = "",
+    createdAt: int = 0,
+    position: int = 0,
+    keycardAccount: bool = false,
+    assetsLoading: bool = true,
+    isWallet: bool = false,
+    areTestNetworksEnabled: bool = false,
+    prodPreferredChainIds: string = "",
+    testPreferredChainIds: string = "",
+    hideFromTotalBalance: bool = false,
+    canSend: bool = true
+  ): Item =
+    new(result, delete)
+    result.setup(name,
+      address,
+      path,
+      colorId,
+      walletType,
+      currencyBalance,
+      emoji,
+      keyUid,
+      createdAt,
+      position,
+      keycardAccount,
+      assetsLoading,
+      isWallet,
+      areTestNetworksEnabled,
+      prodPreferredChainIds,
+      testPreferredChainIds,
+      hideFromTotalBalance,
+      canSend)
 
-proc assetsLoading*(self: Item): bool =
+  proc `$`*(self: Item): string =
-  return self.assetsLoading
+    result = "WalletSection-Accounts-Item("
+    result = result & $self.WalletAccountItem
+    result = result & "\nassetsLoading: " & $self.assetsLoading
+    result = result & "\ncurrencyBalance: " & $self.currencyBalance
+    result = result & "\canSend: " & $self.canSend
+    result = result & ")"
 
-proc createdAt*(self: Item): int =
+  proc currencyBalance*(self: Item): CurrencyAmount =
-  return self.createdAt
+    return self.currencyBalance
 
-proc isWallet*(self: Item): bool =
+  proc assetsLoading*(self: Item): bool =
-  return self.isWallet
+    return self.assetsLoading
+
+  proc createdAt*(self: Item): int =
+    return self.createdAt
+
+  proc isWallet*(self: Item): bool =
+    return self.isWallet
+
+  proc currencyBalanceChanged*(self: Item) {.signal.}
+  proc getCurrencyBalanceAsQVariant*(self: Item): QVariant {.slot.} =
+    return newQVariant(self.currencyBalance)
+  QtProperty[QVariant] currencyBalance:
+    read = getCurrencyBalanceAsQVariant
+    notify = currencyBalanceChanged
+
+  proc canSend*(self: Item): bool =
+    return self.canSend

src/app/modules/main/wallet_section/accounts/model.nim

@@ -19,7 +19,8 @@ type
     AssetsLoading,
     IsWallet,
     PreferredSharingChainIds,
-    HideFromTotalBalance
+    HideFromTotalBalance,
+    CanSend
 
 QtObject:
   type
@@ -70,7 +71,8 @@ QtObject:
       ModelRole.AssetsLoading.int: "assetsLoading",
       ModelRole.IsWallet.int: "isWallet",
       ModelRole.PreferredSharingChainIds.int: "preferredSharingChainIds",
-      ModelRole.HideFromTotalBalance.int: "hideFromTotalBalance"
+      ModelRole.HideFromTotalBalance.int: "hideFromTotalBalance",
+      ModelRole.CanSend.int: "canSend"
     }.toTable
 
 
@@ -124,6 +126,8 @@ QtObject:
       result = newQVariant(item.preferredSharingChainIds())
     of ModelRole.HideFromTotalBalance:
       result = newQVariant(item.hideFromTotalBalance())
+    of ModelRole.CanSend:
+      result = newQVariant(item.canSend())
 
   proc getNameByAddress*(self: Model, address: string): string =
     for item in self.items:

src/app/modules/main/wallet_section/accounts/module.nim

@@ -42,14 +42,18 @@ method delete*(self: Module) =
 method filterChanged*(self: Module, addresses: seq[string], chainIds: seq[int]) =
   let walletAccounts = self.controller.getWalletAccounts()
   let currency = self.controller.getCurrentCurrency()
+  let allChainIds = self.controller.getChainIds()
   let currencyFormat = self.controller.getCurrencyFormat(currency)
   let areTestNetworksEnabled = self.controller.areTestNetworksEnabled()
+
   let items = walletAccounts.map(w => (block:
-    let keycardAccount = self.controller.isKeycardAccount(w)
     let currencyBalance = self.controller.getTotalCurrencyBalance(w.address, chainIds)
+    let keycardAccount = self.controller.isKeycardAccount(w)
     walletAccountToWalletAccountsItem(
       w,
       keycardAccount,
+      allChainIds,
+      chainIds,
       currencyBalance,
       currencyFormat,
       areTestNetworksEnabled,

src/app/modules/main/wallet_section/send/account_item.nim

@@ -1,77 +0,0 @@
-import NimQml
-import ../../../shared_models/wallet_account_item
-import ../../../shared_models/currency_amount
-
-export wallet_account_item
-
-QtObject:
-  type AccountItem* = ref object of WalletAccountItem
-    currencyBalance: CurrencyAmount
-    canSend: bool
-
-  proc setup*(self: AccountItem,
-    keyUid: string,
-    name: string,
-    address: string,
-    colorId: string,
-    emoji: string,
-    walletType: string,
-    currencyBalance: CurrencyAmount,
-    position: int,
-    areTestNetworksEnabled: bool,
-    prodPreferredChainIds: string,
-    testPreferredChainIds: string,
-    canSend: bool
-  ) =
-    self.QObject.setup
-    self.WalletAccountItem.setup(name,
-      address,
-      colorId,
-      emoji,
-      walletType,
-      path = "",
-      keyUid = keyUid,
-      keycardAccount = false,
-      position,
-      operability = wa_dto.AccountFullyOperable,
-      areTestNetworksEnabled,
-      prodPreferredChainIds,
-      testPreferredChainIds)
-    self.currencyBalance = currencyBalance
-    self.canSend = canSend
-
-  proc delete*(self: AccountItem) =
-    self.QObject.delete
-
-  proc newAccountItem*(
-    keyUid: string = "",
-    name: string = "",
-    address: string = "",
-    colorId: string = "",
-    emoji: string = "",
-    walletType: string = "",
-    currencyBalance: CurrencyAmount = nil,
-    areTestNetworksEnabled: bool = false,
-    prodPreferredChainIds: string = "",
-    testPreferredChainIds: string = "",
-    position: int = 0,
-    canSend: bool = true,
-    ): AccountItem =
-      new(result, delete)
-      result.setup(keyUid, name, address, colorId, emoji, walletType, currencyBalance, position, areTestNetworksEnabled, prodPreferredChainIds, testPreferredChainIds, canSend)
-
-  proc `$`*(self: AccountItem): string =
-    result = "WalletSection-Send-Item("
-    result = result & $self.WalletAccountItem
-    result = result & "\ncurrencyBalance: " & $self.currencyBalance
-    result = result & ")"
-
-  proc currencyBalanceChanged*(self: AccountItem) {.signal.}
-  proc getCurrencyBalanceAsQVariant*(self: AccountItem): QVariant {.slot.} =
-    return newQVariant(self.currencyBalance)
-  QtProperty[QVariant] currencyBalance:
-    read = getCurrencyBalanceAsQVariant
-    notify = currencyBalanceChanged
-
-  proc canSend*(self: AccountItem): bool =
-    return self.canSend

src/app/modules/main/wallet_section/send/accounts_model.nim

@@ -1,109 +0,0 @@
-import NimQml, Tables, strutils, stew/shims/strformat
-
-import ./account_item
-import ../../../shared_models/currency_amount
-
-type
-  ModelRole {.pure.} = enum
-    KeyUid = UserRole + 1
-    Name
-    Address
-    ColorId
-    WalletType
-    Emoji
-    CurrencyBalance
-    Position
-    PreferredSharingChainIds
-
-QtObject:
-  type
-    AccountsModel* = ref object of QAbstractListModel
-      items*: seq[AccountItem]
-
-  proc delete(self: AccountsModel) =
-    self.items = @[]
-    self.QAbstractListModel.delete
-
-  proc setup(self: AccountsModel) =
-    self.QAbstractListModel.setup
-
-  proc newAccountsModel*(): AccountsModel =
-    new(result, delete)
-    result.setup
-
-  proc `$`*(self: AccountsModel): string =
-    for i in 0 ..< self.items.len:
-      result &= fmt"""[{i}]:({$self.items[i]})"""
-
-  proc countChanged(self: AccountsModel) {.signal.}
-
-  proc getCount*(self: AccountsModel): int {.slot.} =
-    self.items.len
-
-  QtProperty[int] count:
-    read = getCount
-    notify = countChanged
-
-  method rowCount(self: AccountsModel, index: QModelIndex = nil): int =
-    return self.items.len
-
-  method roleNames(self: AccountsModel): Table[int, string] =
-    {
-      ModelRole.KeyUid.int: "keyUid",
-      ModelRole.Name.int:"name",
-      ModelRole.Address.int:"address",
-      ModelRole.ColorId.int:"colorId",
-      ModelRole.WalletType.int:"walletType",
-      ModelRole.Emoji.int: "emoji",
-      ModelRole.CurrencyBalance.int: "currencyBalance",
-      ModelRole.Position.int: "position",
-      ModelRole.PreferredSharingChainIds.int: "preferredSharingChainIds"
-    }.toTable
-
-  proc setItems*(self: AccountsModel, items: seq[AccountItem]) =
-    self.beginResetModel()
-    self.items = items
-    self.endResetModel()
-    self.countChanged()
-
-  method data(self: AccountsModel, index: QModelIndex, role: int): QVariant =
-    if (not index.isValid):
-      return
-
-    if (index.row < 0 or index.row >= self.items.len):
-      return
-
-    let item = self.items[index.row]
-    let enumRole = role.ModelRole
-
-    case enumRole:
-    of ModelRole.KeyUid:
-      result = newQVariant(item.keyUid())
-    of ModelRole.Name:
-      result = newQVariant(item.name())
-    of ModelRole.Address:
-      result = newQVariant(item.address())
-    of ModelRole.ColorId:
-      result = newQVariant(item.colorId())
-    of ModelRole.WalletType:
-      result = newQVariant(item.walletType())
-    of ModelRole.Emoji:
-      result = newQVariant(item.emoji())
-    of ModelRole.Position:
-      result = newQVariant(item.getPosition())
-    of ModelRole.CurrencyBalance:
-      result = newQVariant(item.getCurrencyBalanceAsQVariant())
-    of ModelRole.PreferredSharingChainIds:
-      result = newQVariant(item.preferredSharingChainIds())
-
-  proc getItemByIndex*(self: AccountsModel, index: int): AccountItem =
-    if index < 0 or index >= self.items.len:
-      return
-    return self.items[index]
-
-proc getItemByAddress*(self: AccountsModel, address: string): tuple[account: AccountItem, index: int] =
-  for i in 0 ..< self.items.len:
-    if self.items[i].address() == address:
-      return (self.items[i], i)
-  if self.items.len > 0:
-    return (self.items[0], 0)

src/app/modules/main/wallet_section/send/io_interface.nim

@@ -18,9 +18,6 @@ method load*(self: AccessInterface) {.base.} =
 method isLoaded*(self: AccessInterface): bool {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method refreshWalletAccounts*(self: AccessInterface) {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method getTokenBalance*(self: AccessInterface, address: string, chainId: int, tokensKey: string): CurrencyAmount {.base.} =
   raise newException(ValueError, "No implementation available")
 
@@ -66,7 +63,7 @@ method authenticateUser*(self: AccessInterface) {.base.} =
 method onUserAuthenticated*(self: AccessInterface, pin: string, password: string, keyUid: string) {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method setSelectedSenderAccountIndex*(self: AccessInterface, index: int) {.base.} =
+method notifySelectedSenderAccountChanged*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method setSelectedReceiveAccountIndex*(self: AccessInterface, index: int) {.base.} =

src/app/modules/main/wallet_section/send/module.nim

@@ -10,12 +10,10 @@ import app_service/service/currency/service as currency_service
 import app_service/service/transaction/service as transaction_service
 import app_service/service/keycard/service as keycard_service
 import app_service/service/keycard/constants as keycard_constants
-import app/modules/shared/wallet_utils
 import app_service/service/transaction/dto
 import app_service/service/transaction/dtoV2
 import app_service/service/transaction/dto_conversion
 import app/modules/shared_models/currency_amount
-import app_service/service/token/service
 import app_service/service/network/network_item as network_service_item
 
 import app/modules/shared_modules/collectibles/controller as collectiblesc
@@ -58,9 +56,6 @@ type
     tmpSendTransactionDetails: TmpSendTransactionDetails
     tmpPin: string
     tmpTxHashBeingProcessed: string
-    senderCurrentAccountIndex: int
-    # To-do we should create a dedicated module Receive
-    receiveCurrentAccountIndex: int
 
 # Forward declaration
 method getTokenBalance*(self: Module, address: string, chainId: int, tokensKey: string): CurrencyAmount
@@ -89,8 +84,6 @@ proc newModule*(
   result.view = newView(result)
 
   result.moduleLoaded = false
-  result.senderCurrentAccountIndex = 0
-  result.receiveCurrentAccountIndex = 0
 
 method delete*(self: Module) =
   self.view.delete
@@ -176,30 +169,6 @@ proc convertTransactionPathDtoToSuggestedRouteItem(self: Module, path: Transacti
     approvalContractAddress = path.approvalContractAddress
     )
 
-method refreshWalletAccounts*(self: Module) =
-  let walletAccounts = self.controller.getWalletAccounts()
-  let currency = self.controller.getCurrentCurrency()
-  let enabledChainIds = self.controller.getEnabledChainIds()
-  let currencyFormat = self.controller.getCurrencyFormat(currency)
-  let chainIds = self.controller.getChainIds()
-  let areTestNetworksEnabled = self.controller.areTestNetworksEnabled()
-
-  let items = walletAccounts.map(w => (block:
-    let currencyBalance = self.controller.getTotalCurrencyBalance(@[w.address], enabledChainIds)
-    walletAccountToWalletSendAccountItem(
-      w,
-      chainIds,
-      enabledChainIds,
-      currencyBalance,
-      currencyFormat,
-      areTestNetworksEnabled,
-    )
-  ))
-
-  self.view.setItems(items)
-  self.view.switchSenderAccount(self.senderCurrentAccountIndex)
-  self.view.switchReceiveAccount(self.receiveCurrentAccountIndex)
-
 proc refreshNetworks*(self: Module) =
   let networks = self.controller.getCurrentNetworks()
   let fromNetworks = networks.map(x => self.convertNetworkDtoToNetworkItem(x))
@@ -210,43 +179,9 @@ method load*(self: Module) =
   singletonInstance.engine.setRootContextProperty("walletSectionSend", newQVariant(self.view))
 
   # these connections should be part of the controller's init method
-  self.events.on(SIGNAL_KEYPAIR_SYNCED) do(e: Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_WALLET_ACCOUNT_SAVED) do(e:Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_WALLET_ACCOUNT_DELETED) do(e:Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_WALLET_ACCOUNT_UPDATED) do(e:Args):
-    self.refreshWalletAccounts()
-
   self.events.on(SIGNAL_WALLET_ACCOUNT_NETWORK_ENABLED_UPDATED) do(e:Args):
-    self.refreshWalletAccounts()
     self.refreshNetworks()
 
-  self.events.on(SIGNAL_WALLET_ACCOUNT_TOKENS_REBUILT) do(e:Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_CURRENCY_FORMATS_UPDATED) do(e:Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_NEW_KEYCARD_SET) do(e: Args):
-    let args = KeycardArgs(e)
-    if not args.success:
-      return
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_WALLET_ACCOUNT_PREFERRED_SHARING_CHAINS_UPDATED) do(e:Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_WALLET_ACCOUNT_HIDDEN_UPDATED) do(e: Args):
-    self.refreshWalletAccounts()
-
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e: Args):
-    self.refreshWalletAccounts()
-
   self.controller.init()
   self.view.load()
 
@@ -254,7 +189,6 @@ method isLoaded*(self: Module): bool =
   return self.moduleLoaded
 
 method viewDidLoad*(self: Module) =
-  self.refreshWalletAccounts()
   self.refreshNetworks()
   self.moduleLoaded = true
   self.delegate.sendModuleDidLoad()
@@ -398,23 +332,19 @@ method suggestedRoutes*(self: Module,
 method filterChanged*(self: Module, addresses: seq[string], chainIds: seq[int]) =
   if addresses.len == 0:
     return
-  self.view.switchSenderAccountByAddress(addresses[0])
+  self.view.setSenderAccount(addresses[0])
-  self.view.switchReceiveAccountByAddress(addresses[0])
+  self.view.setReceiverAccount(addresses[0])
 
 proc updateCollectiblesFilter*(self: Module) =
-  let senderAddress = self.view.getSenderAddressByIndex(self.senderCurrentAccountIndex)
+  let senderAddress = self.view.getSelectedSenderAccountAddress()
   let addresses = @[senderAddress]
   let chainIds = self.controller.getChainIds()
   self.collectiblesController.setFilterAddressesAndChains(addresses, chainIds)
   self.nestedCollectiblesModel.setAddress(senderAddress)
 
-method setSelectedSenderAccountIndex*(self: Module, index: int) =
+method notifySelectedSenderAccountChanged*(self: Module) =
-  self.senderCurrentAccountIndex = index
   self.updateCollectiblesFilter()
 
-method setSelectedReceiveAccountIndex*(self: Module, index: int) =
-  self.receiveCurrentAccountIndex = index
-
 method getCollectiblesModel*(self: Module): collectibles.Model =
   return self.collectiblesController.getModel()
 

src/app/modules/main/wallet_section/send/view.nim

@@ -1,7 +1,7 @@
-import NimQml, Tables, json, sequtils, strutils, stint, sugar, options, chronicles
+import NimQml, Tables, json, sequtils, strutils, stint, options, chronicles
 import uuids
 
-import ./io_interface, ./accounts_model, ./account_item, ./network_model, ./network_item, ./suggested_route_item, ./transaction_routes
+import ./io_interface, ./network_model, ./network_item, ./suggested_route_item, ./transaction_routes
 import app/modules/shared_models/collectibles_model as collectibles
 import app/modules/shared_models/collectibles_nested_model as nested_collectibles
 import app_service/service/transaction/dto as transaction_dto
@@ -10,14 +10,10 @@ QtObject:
   type
     View* = ref object of QObject
       delegate: io_interface.AccessInterface
-      accounts: AccountsModel
-      # this one doesn't include watch accounts and its what the user switches when using the sendModal
-      senderAccounts: AccountsModel
       # list of collectibles owned by the selected sender account
       collectiblesModel: collectibles.Model
       nestedCollectiblesModel: nested_collectibles.Model
       # for send modal
-      selectedSenderAccount: AccountItem
       fromNetworksModel: NetworkModel
       toNetworksModel: NetworkModel
       transactionRoutes: TransactionRoutes
@@ -28,31 +24,24 @@ QtObject:
       selectedTokenIsOwnerToken: bool
       selectedTokenName: string
       selectedRecipient: string
+      selectedSenderAccountAddress: string
       # for receive modal
-      selectedReceiveAccount: AccountItem
+      selectedReceiveAccountAddress: string
 
   # Forward declaration
   proc updateNetworksDisabledChains(self: View)
   proc updateNetworksTokenBalance(self: View)
 
   proc delete*(self: View) =
-    self.accounts.delete
-    self.senderAccounts.delete
-    if self.selectedSenderAccount != nil:
-      self.selectedSenderAccount.delete
     self.fromNetworksModel.delete
     self.toNetworksModel.delete
     self.transactionRoutes.delete
-    if self.selectedReceiveAccount != nil:
-      self.selectedReceiveAccount.delete
     self.QObject.delete
 
   proc newView*(delegate: io_interface.AccessInterface): View =
     new(result, delete)
     result.QObject.setup
     result.delegate = delegate
-    result.accounts = newAccountsModel()
-    result.senderAccounts = newAccountsModel()
     result.fromNetworksModel = newNetworkModel()
     result.toNetworksModel = newNetworkModel()
     result.transactionRoutes = newTransactionRoutes()
@@ -62,19 +51,16 @@ QtObject:
   proc load*(self: View) =
     self.delegate.viewDidLoad()
 
-  proc accountsChanged*(self: View) {.signal.}
+  proc selectedSenderAccountAddressChanged*(self: View) {.signal.}
-  proc getAccounts(self: View): QVariant {.slot.} =
+  proc getSelectedSenderAccountAddress*(self: View): string {.slot.} =
-    return newQVariant(self.accounts)
+    return self.selectedSenderAccountAddress
-  QtProperty[QVariant] accounts:
+  proc setSelectedSenderAccountAddress*(self: View, address: string) {.slot.} =
-    read = getAccounts
+    self.selectedSenderAccountAddress = address
-    notify = accountsChanged
+    self.updateNetworksTokenBalance()
-
+    self.selectedSenderAccountAddressChanged()
-  proc senderAccountsChanged*(self: View) {.signal.}
+  QtProperty[string] selectedSenderAccountAddress:
-  proc getSenderAccounts(self: View): QVariant {.slot.} =
+    read = getSelectedSenderAccountAddress
-    return newQVariant(self.senderAccounts)
+    notify = selectedSenderAccountAddressChanged
-  QtProperty[QVariant] senderAccounts:
-    read = getSenderAccounts
-    notify = senderAccountsChanged
 
   proc collectiblesModelChanged*(self: View) {.signal.}
   proc getCollectiblesModel(self: View): QVariant {.slot.} =
@@ -90,29 +76,15 @@ QtObject:
     read = getNestedCollectiblesModel
     notify = nestedCollectiblesModelChanged
 
-  proc selectedSenderAccountChanged*(self: View) {.signal.}
+  proc selectedReceiveAccountAddressChanged*(self: View) {.signal.}
-  proc getSelectedSenderAccount(self: View): QVariant {.slot.} =
+  proc getSelectedReceiveAccountAddress*(self: View): string {.slot.} =
-    return newQVariant(self.selectedSenderAccount)
+    return self.selectedReceiveAccountAddress
-  proc setSelectedSenderAccount*(self: View, account: AccountItem) =
+  proc setSelectedReceiveAccountAddress*(self: View, address: string) {.slot.} =
-    self.selectedSenderAccount = account
+    self.selectedReceiveAccountAddress = address
-    self.updateNetworksTokenBalance()
+    self.selectedReceiveAccountAddressChanged()
-    self.selectedSenderAccountChanged()
+  QtProperty[string] selectedReceiveAccountAddress:
-  QtProperty[QVariant] selectedSenderAccount:
+    read = getSelectedReceiveAccountAddress
-    read = getSelectedSenderAccount
+    notify = selectedReceiveAccountAddressChanged
-    notify = selectedSenderAccountChanged
-
-  proc getSenderAddressByIndex*(self: View, index: int): string {.slot.} =
-    return self.senderAccounts.getItemByIndex(index).address()
-
-  proc selectedReceiveAccountChanged*(self: View) {.signal.}
-  proc getSelectedReceiveAccount(self: View): QVariant {.slot.} =
-    return newQVariant(self.selectedReceiveAccount)
-  proc setSelectetReceiveAccount*(self: View, account: AccountItem) =
-    self.selectedReceiveAccount = account
-    self.selectedReceiveAccountChanged()
-  QtProperty[QVariant] selectedReceiveAccount:
-    read = getSelectedReceiveAccount
-    notify = selectedReceiveAccountChanged
 
   proc fromNetworksModelChanged*(self: View) {.signal.}
   proc getFromNetworksModel(self: View): QVariant {.slot.} =
@@ -200,16 +172,8 @@ QtObject:
 
   proc updateNetworksTokenBalance(self: View) =
     for chainId in self.toNetworksModel.getAllNetworksChainIds():
-      self.fromNetworksModel.updateTokenBalanceForSymbol(chainId, self.delegate.getTokenBalance(self.selectedSenderAccount.address(), chainId, self.selectedAssetKey))
+      self.fromNetworksModel.updateTokenBalanceForSymbol(chainId, self.delegate.getTokenBalance(self.selectedSenderAccountAddress, chainId, self.selectedAssetKey))
-      self.toNetworksModel.updateTokenBalanceForSymbol(chainId, self.delegate.getTokenBalance(self.selectedSenderAccount.address(), chainId, self.selectedAssetKey))
+      self.toNetworksModel.updateTokenBalanceForSymbol(chainId, self.delegate.getTokenBalance(self.selectedSenderAccountAddress, chainId, self.selectedAssetKey))
-
-  proc setItems*(self: View, items: seq[AccountItem]) =
-    self.accounts.setItems(items)
-    self.accountsChanged()
-
-    # need to remove watch only accounts as a user cant send a tx with a watch only account + remove not operable account
-    self.senderAccounts.setItems(items.filter(a => a.canSend()))
-    self.senderAccountsChanged()
 
   proc setNetworkItems*(self: View, fromNetworks: seq[NetworkItem], toNetworks: seq[NetworkItem]) =
     self.fromNetworksModel.setItems(fromNetworks)
@@ -226,7 +190,7 @@ QtObject:
     return parsedChainIds
 
   proc authenticateAndTransfer*(self: View, uuid: string) {.slot.} =
-    self.delegate.authenticateAndTransfer(self.selectedSenderAccount.address(), self.selectedRecipient, self.selectedAssetKey,
+    self.delegate.authenticateAndTransfer(self.selectedSenderAccountAddress, self.selectedRecipient, self.selectedAssetKey,
       self.selectedToAssetKey, uuid, self.sendType, self.selectedTokenName, self.selectedTokenIsOwnerToken)
 
   proc suggestedRoutesReady*(self: View, suggestedRoutes: QVariant) {.signal.}
@@ -246,7 +210,7 @@ QtObject:
     self.delegate.suggestedRoutes(
       $genUUID(),
       self.sendType,
-      self.selectedSenderAccount.address(),
+      self.selectedSenderAccountAddress,
       self.selectedRecipient,
       self.selectedAssetKey,
       amountIn,
@@ -258,48 +222,15 @@ QtObject:
       extraParamsTable
     )
 
-  proc switchSenderAccountByAddress*(self: View, address: string) {.slot.} =
-    let (account, index) = self.senderAccounts.getItemByAddress(address)
-    self.setSelectedSenderAccount(account)
-    self.delegate.setSelectedSenderAccountIndex(index)
-
-  proc switchReceiveAccountByAddress*(self: View, address: string) {.slot.} =
-    let (account, index) = self.accounts.getItemByAddress(address)
-    self.setSelectetReceiveAccount(account)
-    self.delegate.setSelectedReceiveAccountIndex(index)
-
-  proc switchSenderAccount*(self: View, index: int) {.slot.} =
-    var account = self.senderAccounts.getItemByIndex(index)
-    var idx = index
-    if account.isNil:
-      account = self.senderAccounts.getItemByIndex(0)
-      idx = 0
-
-    self.setSelectedSenderAccount(account)
-    self.delegate.setSelectedSenderAccountIndex(idx)
-
-  proc switchReceiveAccount*(self: View, index: int) {.slot.} =
-    var account = self.accounts.getItemByIndex(index)
-    var idx = index
-    if account.isNil:
-      account = self.accounts.getItemByIndex(0)
-      idx = 0
-
-    self.setSelectetReceiveAccount(account)
-    self.delegate.setSelectedReceiveAccountIndex(idx)
-
   proc updateRoutePreferredChains*(self: View, chainIds: string) {.slot.} =
     self.toNetworksModel.updateRoutePreferredChains(chainIds)
 
-  proc getSelectedSenderAccountAddress*(self: View): string =
-    return self.selectedSenderAccount.address()
-
   proc updatedNetworksWithRoutes*(self: View, paths: seq[SuggestedRouteItem], totalFeesInEth: float) =
     self.fromNetworksModel.resetPathData()
     self.toNetworksModel.resetPathData()
     for path in paths:
       let fromChainId = path.getfromNetwork()
-      let hasGas = self.delegate.hasGas(self.selectedSenderAccount.address, fromChainId, self.fromNetworksModel.getNetworkNativeGasSymbol(fromChainId), totalFeesInEth)
+      let hasGas = self.delegate.hasGas(self.selectedSenderAccountAddress, fromChainId, self.fromNetworksModel.getNetworkNativeGasSymbol(fromChainId), totalFeesInEth)
       self.fromNetworksModel.updateFromNetworks(path, hasGas)
       self.toNetworksModel.updateToNetworks(path)
 
@@ -392,3 +323,10 @@ QtObject:
   proc transactionSendingComplete*(self: View, txHash: string, success: bool) {.signal.}
   proc sendtransactionSendingCompleteSignal*(self: View, txHash: string, success: bool) =
     self.transactionSendingComplete(txHash, success)
+      
+  proc setSenderAccount*(self: View, address: string) {.slot.} =
+    self.setSelectedSenderAccountAddress(address)
+    self.delegate.notifySelectedSenderAccountChanged()
+
+  proc setReceiverAccount*(self: View, address: string) {.slot.} =
+    self.setSelectedReceiveAccountAddress(address)

src/app/modules/shared/wallet_utils.nim

@@ -3,7 +3,6 @@ import ../shared_models/[currency_amount, wallet_account_item]
 import app_service/service/currency/dto as currency_dto
 
 import ../main/wallet_section/accounts/item as wallet_accounts_item
-import ../main/wallet_section/send/account_item as wallet_send_account_item
 
 proc currencyAmountToItem*(amount: float64, format: CurrencyFormatDto) : CurrencyAmount =
   return newCurrencyAmount(
@@ -35,9 +34,10 @@ proc walletAccountToWalletAccountItem*(w: WalletAccountDto, keycardAccount: bool
   )
 
 proc walletAccountToWalletAccountsItem*(w: WalletAccountDto, keycardAccount: bool,
+  chainIds: seq[int], enabledChainIds: seq[int], 
   currencyBalance: float64, currencyFormat: CurrencyFormatDto, areTestNetworksEnabled: bool,
   marketValuesLoading: bool): wallet_accounts_item.Item =
-  return wallet_accounts_item.initItem(
+  return wallet_accounts_item.newItem(
     w.name,
     w.address,
     w.path,
@@ -54,21 +54,7 @@ proc walletAccountToWalletAccountsItem*(w: WalletAccountDto, keycardAccount: boo
     areTestNetworksEnabled,
     w.prodPreferredChainIds,
     w.testPreferredChainIds,
-    w.hideFromTotalBalance
+    w.hideFromTotalBalance,
-  )
-
-proc walletAccountToWalletSendAccountItem*(w: WalletAccountDto, chainIds: seq[int], enabledChainIds: seq[int],
-  currencyBalance: float64, currencyFormat: CurrencyFormatDto, areTestNetworksEnabled: bool): wallet_send_account_item.AccountItem =
-  return wallet_send_account_item.newAccountItem(
-    w.keyUid,
-    w.name,
-    w.address,
-    w.colorId,
-    w.emoji,
-    w.walletType,
-    currencyAmountToItem(currencyBalance, currencyFormat),
-    areTestNetworksEnabled,
-    w.prodPreferredChainIds,
-    w.testPreferredChainIds,
     canSend=w.walletType != "watch" and (w.operable==AccountFullyOperable or w.operable==AccountPartiallyOperable)
   )
+  

storybook/pages/SendModalPage.qml

@@ -217,8 +217,8 @@ SplitView {
                 }
                 ComboBox {
                     textRole: "name"
-                    model: txStore.senderAccounts
+                    model: txStore.accounts
-                    onCurrentIndexChanged: loader.preSelectedAccount = txStore.senderAccounts.get(currentIndex)
+                    onCurrentIndexChanged: loader.preSelectedAccount = txStore.accounts.get(currentIndex)
                 }
             }
 

storybook/stubs/shared/stores/send/TransactionStore.qml

@@ -13,10 +13,10 @@ QtObject {
     id: root
 
     readonly property CurrenciesStore currencyStore: CurrenciesStore {}
-    readonly property var senderAccounts: WalletSendAccountsModel {
+    
-        Component.onCompleted: selectedSenderAccount = senderAccounts.get(0)
+    readonly property var accounts: WalletSendAccountsModel {
+        Component.onCompleted: selectedSenderAccount = accounts.get(0)
     }
-    property var accounts: senderAccounts
 
     property WalletAssetsStore walletAssetStore
 
@@ -27,7 +27,7 @@ QtObject {
     property var flatNetworksModel: NetworksModel.flatNetworks
     property var fromNetworksModel: NetworksModel.sendFromNetworks
     property var toNetworksModel: NetworksModel.sendToNetworks
-    property var selectedSenderAccount: senderAccounts.get(0)
+    property var selectedSenderAccount: accounts.get(0)
     readonly property QtObject collectiblesModel: ManageCollectiblesModel {}
     readonly property QtObject nestedCollectiblesModel: WalletNestedCollectiblesModel {}
 
@@ -150,10 +150,11 @@ QtObject {
         }
     }
 
-    function switchSenderAccountByAddress(address) {
+    function setSenderAccountByAddress(address) {
-        for (let i = 0; i < senderAccounts.count; i++) {
+        for (let i = 0; i < accounts.count; i++) {
-            if (senderAccounts.get(i).address === address) {
+            const acc = accounts.get(i)
-                selectedSenderAccount = senderAccounts.get(i)
+            if (acc.address === address && accounts.canSend) {
+                selectedSenderAccount = accounts.get(i)
                 break
             }
         }

ui/app/AppLayouts/Chat/stores/RootStore.qml

@@ -486,8 +486,7 @@ QtObject {
     }
 
     // Needed for TX in chat for stickers and via contact
-
+    readonly property var accounts: walletSectionAccounts.accounts
-    property var accounts: walletSectionSendInst.accounts
     property string currentCurrency: walletSection.currentCurrency
     property CurrenciesStore currencyStore: CurrenciesStore {}
     property var savedAddressesModel: walletSectionSavedAddresses.model

ui/app/AppLayouts/Profile/views/EnsDetailsView.qml

@@ -134,7 +134,7 @@ Item {
                     root.ensUsernamesStore.authenticateAndReleaseEns(
                                 root.chainId,
                                 root.username,
-                                store.selectedSenderAccount.address,
+                                store.selectedSenderAccountAddress,
                                 path.gasAmount,
                                 eip1559Enabled ? "" : path.gasFees.gasPrice,
                                 eip1559Enabled ? path.gasFees.maxPriorityFeePerGas : "",

ui/app/AppLayouts/Profile/views/EnsSearchView.qml

@@ -78,7 +78,7 @@ Item {
                     root.ensUsernamesStore.authenticateAndSetPubKey(
                                 root.ensUsernamesStore.chainId,
                                 ensUsername.text + (isStatus ? ".stateofus.eth" : "" ),
-                                store.selectedSenderAccount.address,
+                                store.selectedSenderAccountAddress,
                                 path.gasAmount,
                                 eip1559Enabled ? "" : path.gasFees.gasPrice,
                                 "",

ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml

@@ -78,7 +78,7 @@ Item {
                     root.ensUsernamesStore.authenticateAndRegisterEns(
                                 root.ensUsernamesStore.chainId,
                                 username,
-                                store.selectedSenderAccount.address,
+                                store.selectedSenderAccountAddress,
                                 path.gasAmount,
                                 eip1559Enabled ? "" : path.gasFees.gasPrice,
                                 eip1559Enabled ? path.gasFees.maxPriorityFeePerGas : "",

ui/app/AppLayouts/Wallet/WalletLayout.qml

@@ -8,6 +8,7 @@ import StatusQ.Core.Utils 0.1 as StatusQUtils
 import utils 1.0
 import shared.controls 1.0
 import shared.popups.keypairimport 1.0
+import shared.stores.send 1.0
 
 import "popups"
 import "panels"
@@ -23,6 +24,7 @@ Item {
     property var store
     property var contactsStore
     property var communitiesStore
+    required property TransactionStore transactionStore
     property var emojiPopup: null
     property var sendModalPopup
     property var networkConnectionStore
@@ -284,6 +286,7 @@ Item {
             width: parent.width
             height: visible ? 61: implicitHeight
             walletStore: RootStore
+            transactionStore: root.transactionStore
             networkConnectionStore: root.networkConnectionStore
             isCommunityOwnershipTransfer: footer.isHoldingSelected && footer.isOwnerCommunityCollectible
             communityName: {

ui/app/AppLayouts/Wallet/panels/WalletFooter.qml

@@ -8,6 +8,7 @@ import StatusQ.Core.Theme 0.1
 
 import utils 1.0
 import shared.controls 1.0
+import shared.stores.send 1.0
 
 import "../controls"
 import "../popups"
@@ -17,6 +18,7 @@ Rectangle {
 
     property var walletStore
     property var networkConnectionStore
+    required property TransactionStore transactionStore
 
     // Community-token related properties:
     required property bool isCommunityOwnershipTransfer
@@ -52,7 +54,10 @@ Rectangle {
             icon.name: "send"
             text: root.isCommunityOwnershipTransfer ? qsTr("Send Owner token to transfer %1 Community ownership").arg(root.communityName) : qsTr("Send")
             interactive: !d.isCollectibleSoulbound && networkConnectionStore.sendBuyBridgeEnabled
-            onClicked: root.launchSendModal()
+            onClicked: {
+                root.transactionStore.setSenderAccount(root.walletStore.selectedAddress)
+                root.launchSendModal()
+            }
             tooltip.text: d.isCollectibleSoulbound ? qsTr("Soulbound collectibles cannot be sent to another wallet") : networkConnectionStore.sendBuyBridgeToolTipText
             visible: !walletStore.overview.isWatchOnlyAccount && walletStore.overview.canSend && !root.walletStore.showAllAccounts
         }
@@ -62,6 +67,7 @@ Rectangle {
             text: qsTr("Receive")
             visible: !root.walletStore.showAllAccounts
             onClicked: function () {
+                root.transactionStore.setReceiverAccount(root.walletStore.selectedAddress)
                 launchShareAddressModal()
             }
         }

ui/app/AppLayouts/Wallet/stores/RootStore.qml

@@ -42,9 +42,7 @@ QtObject {
     property string backButtonName: ""
     property var overview: walletSectionOverview
     property bool balanceLoading: overview.balanceLoading
-    property var accounts: walletSectionAccounts.accounts
+    readonly property var accounts: walletSectionAccounts.accounts
-    property var receiveAccounts: walletSectionSend.accounts
-    property var selectedReceiveAccount: walletSectionSend.selectedReceiveAccount
     property var appSettings: localAppSettings
     property var accountSensitiveSettings: localAccountSensitiveSettings
     property bool hideSignPhraseModal: accountSensitiveSettings.hideSignPhraseModal
@@ -65,7 +63,7 @@ QtObject {
     }
 
     property var nonWatchAccounts: SortFilterProxyModel {
-        sourceModel: receiveAccounts
+        sourceModel: accounts
         proxyRoles: [
             ExpressionRole {
                 name: "color"
@@ -408,10 +406,6 @@ QtObject {
         walletSection.runEditAccountPopup(address)
     }
 
-    function switchReceiveAccountByAddress(address) {
-        walletSectionSend.switchReceiveAccountByAddress(address)
-    }
-
     function toggleWatchOnlyAccounts() {
         walletSection.toggleWatchOnlyAccounts()
     }

ui/app/AppLayouts/stores/RootStore.qml

@@ -153,8 +153,7 @@ QtObject {
     // Not Refactored Yet
 //    property var walletModelInst: walletModel
     property var userProfileInst: userProfile
-
+    readonly property var accounts: walletSectionAccounts.accounts
-    property var accounts: walletSectionSendInst.accounts
     // Not Refactored Yet
 //    property var profileModelInst: profileModel
 

ui/app/mainui/AppMain.qml

@@ -36,6 +36,8 @@ import StatusQ.Layout 0.1
 import StatusQ.Popups 0.1
 import StatusQ.Popups.Dialog 0.1
 import StatusQ.Core 0.1
+import StatusQ.Core.Utils 0.1
+import StatusQ 0.1
 
 import AppLayouts.Browser.stores 1.0 as BrowserStores
 import AppLayouts.stores 1.0
@@ -1284,6 +1286,7 @@ Item {
                             store: appMain.rootStore
                             contactsStore: appMain.rootStore.profileSectionStore.contactsStore
                             communitiesStore: appMain.communitiesStore
+                            transactionStore: appMain.transactionStore
                             emojiPopup: statusEmojiPopup.item
                             sendModalPopup: sendModal
                             networkConnectionStore: appMain.networkConnectionStore
@@ -1946,25 +1949,32 @@ Item {
 
         sourceComponent: WalletPopups.ReceiveModal {
 
+            ModelEntry {
+                id: selectedReceiverAccount
+                key: "address"
+                sourceModel: appMain.transactionStore.accounts
+                value: appMain.transactionStore.selectedReceiverAccountAddress
+            }
+
             accounts: {
                 if (showQR.showSingleAccount || showQR.showForSavedAddress) {
                     return null
                 }
-                return WalletStore.RootStore.receiveAccounts
+                return WalletStore.RootStore.accounts
             }
 
             selectedAccount: {
                 if (showQR.showSingleAccount || showQR.showForSavedAddress) {
                     return showQR.selectedAccount
                 }
-                return WalletStore.RootStore.selectedReceiveAccount
+                return selectedReceiverAccount.item ?? ModelUtils.get(appMain.transactionStore.accounts, 0)
             }
 
             onUpdateSelectedAddress: (address) => {
                 if (showQR.showSingleAccount || showQR.showForSavedAddress) {
                     return
                 }
-                WalletStore.RootStore.switchReceiveAccountByAddress(address)
+                appMain.transactionStore.setReceiverAccount(address)
             }
 
             onUpdatePreferredChains: {

ui/imports/shared/popups/send/SendModal.qml

@@ -30,7 +30,7 @@ import "./models"
 StatusDialog {
     id: popup
 
-    property var preSelectedAccount: store.selectedSenderAccount
+    property var preSelectedAccount: selectedAccount
     // expected content depends on the preSelectedRecipientType value.
     // If type Address this must be a string else it expects an object. See RecipientView.selectedRecipientType
     property var preSelectedRecipient
@@ -57,6 +57,8 @@ StatusDialog {
         standardButtons: StandardButton.Ok
     }
 
+    readonly property var selectedAccount: selectedSenderAccountEntry.item ?? ModelUtils.get(store.accounts, 0)
+
     property var sendTransaction: function() {
         d.isPendingTx = true
         popup.store.authenticateAndTransfer(d.uuid)
@@ -165,13 +167,20 @@ StatusDialog {
         controller: popup.store.walletAssetStore.assetsController
         showCommunityAssets: popup.store.tokensStore.showCommunityAssetsInSend
         tokensModel: popup.store.walletAssetStore.groupedAccountAssetsModel
-        account: popup.store.selectedSenderAccount.address
+        account: popup.store.selectedSenderAccountAddress
         marketValueThreshold:
             popup.store.tokensStore.displayAssetsBelowBalance
             ? popup.store.tokensStore.getDisplayAssetsBelowBalanceThresholdDisplayAmount()
             : 0
     }
 
+    ModelEntry {
+        id: selectedSenderAccountEntry
+        key: "address"
+        sourceModel: popup.store.accounts
+        value: popup.store.selectedSenderAccountAddress
+    }
+
     bottomPadding: 16
     padding: 0
     background: StatusDialogBackground {
@@ -224,7 +233,15 @@ StatusDialog {
         AccountSelectorHeader {
             id: accountSelector
             model: SortFilterProxyModel {
-                sourceModel: popup.store.senderAccounts
+                sourceModel: SortFilterProxyModel {
+                    sourceModel: popup.store.accounts
+                    filters: [
+                        ValueFilter {
+                            roleName: "canSend"
+                            value: true
+                        }
+                    ]
+                }
 
                 sorters: RoleSorter { roleName: "position"; sortOrder: Qt.AscendingOrder }
                 proxyRoles: [
@@ -241,7 +258,7 @@ StatusDialog {
             }
             selectedAddress: !!popup.preSelectedAccount && !!popup.preSelectedAccount.address ? popup.preSelectedAccount.address : ""
             onCurrentAccountAddressChanged: {
-                store.switchSenderAccountByAddress(currentAccountAddress)
+                store.setSenderAccount(currentAccountAddress)
                 if (d.isSelectedHoldingValidAsset) {
                     d.setSelectedHoldingId(d.selectedHolding.symbol, d.selectedHoldingType)
                 }

ui/imports/shared/status/StatusStickerMarket.qml

@@ -220,7 +220,7 @@ Item {
                     let eip1559Enabled = path.gasFees.eip1559Enabled
                     let maxFeePerGas = path.gasFees.maxFeePerGasM
                     root.store.stickersStore.authenticateAndBuy(packId,
-                                                 store.selectedSenderAccount.address,
+                                                 store.selectedSenderAccountAddress,
                                                  path.gasAmount,
                                                  eip1559Enabled ? "" : path.gasFees.gasPrice,
                                                  eip1559Enabled ? path.gasFees.maxPriorityFeePerGas : "",

ui/imports/shared/status/StatusStickerPackClickPopup.qml

@@ -90,7 +90,7 @@ ModalPopup {
                         let eip1559Enabled = path.gasFees.eip1559Enabled
                         let maxFeePerGas = path.gasFees.maxFeePerGasM
                         stickerPackDetailsPopup.store.stickersStore.authenticateAndBuy(packId,
-                                                                                       store.selectedSenderAccount.address,
+                                                                                       store.selectedSenderAccountAddress,
                                                                                        path.gasAmount,
                                                                                        eip1559Enabled ? "" : path.gasFees.gasPrice,
                                                                                        eip1559Enabled ? path.gasFees.maxPriorityFeePerGas : "",

ui/imports/shared/stores/send/TransactionStore.qml

@@ -21,12 +21,13 @@ QtObject {
     property var mainModuleInst: mainModule
     property var walletSectionSendInst: walletSectionSend
 
+    readonly property var accounts: walletSectionAccounts.accounts
+
     property var fromNetworksModel: walletSectionSendInst.fromNetworksModel
     property var toNetworksModel: walletSectionSendInst.toNetworksModel
     property var flatNetworksModel: networksModule.flatNetworks
-    property var senderAccounts: walletSectionSendInst.senderAccounts
+    readonly property string selectedReceiverAccountAddress: walletSectionSendInst.selectedReceiveAccountAddress
-    property var selectedSenderAccount: walletSectionSendInst.selectedSenderAccount
+    readonly property string selectedSenderAccountAddress: walletSectionSendInst.selectedSenderAccountAddress
-    property var accounts: walletSectionSendInst.accounts
     property var collectiblesModel: walletSectionSendInst.collectiblesModel
     property var nestedCollectiblesModel: walletSectionSendInst.nestedCollectiblesModel
     property bool areTestNetworksEnabled: networksModule.areTestNetworksEnabled
@@ -146,8 +147,12 @@ QtObject {
         }
     }
 
-    function switchSenderAccountByAddress(address) {
+    function setSenderAccount(address) {
-        walletSectionSendInst.switchSenderAccountByAddress(address)
+        walletSectionSendInst.setSenderAccount(address)
+    }
+
+    function setReceiverAccount(address) {
+        walletSectionSendInst.setReceiverAccount(address)
     }
 
     function getNetworkShortNames(chainIds) {