feat: activities in a browser wallet

Author: vkjr

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

@@ -14,6 +14,8 @@ import ../../../../app_service/service/dapp_permissions/service as dapp_permissi
 import ../../../../app_service/service/wallet_account/service as wallet_account_service
 import ../../../../app_service/service/token/service as token_service
 import ../../../../app_service/service/currency/service as currency_service
+import ../../../../app_service/service/saved_address/service as saved_address_service
+import ../wallet_section/activity/controller as activity_controller
 
 export io_interface
 
@@ -27,6 +29,7 @@ type
     bookmarkModule: bookmark_module.AccessInterface
     dappsModule: dapps_module.AccessInterface
     currentAccountModule: current_account_module.AccessInterface
+    activityController: activity_controller.Controller
 
 proc newModule*(delegate: delegate_interface.AccessInterface,
     events: EventEmitter,
@@ -36,12 +39,19 @@ proc newModule*(delegate: delegate_interface.AccessInterface,
     dappPermissionsService: dapp_permissions_service.Service,
     walletAccountService: wallet_account_service.Service,
     tokenService: token_service.Service,
-    currencyService: currency_service.Service
+    currencyService: currency_service.Service,
+    savedAddressService: saved_address_service.Service
 ): Module =
   result = Module()
   result.delegate = delegate
   result.events = events
-  result.view = view.newView(result)
+  result.activityController = activity_controller.newController(
+    currencyService,
+    tokenService,
+    savedAddressService,
+    networkService,
+    events)
+  result.view = view.newView(result, result.activityController)
   result.viewVariant = newQVariant(result.view)
   result.moduleLoaded = false
   result.bookmarkModule = bookmark_module.newModule(result, events, bookmarkService)
@@ -51,6 +61,7 @@ proc newModule*(delegate: delegate_interface.AccessInterface,
 method delete*(self: Module) =
   self.view.delete
   self.viewVariant.delete
+  self.activityController.delete
   self.bookmarkModule.delete
   self.dappsModule.delete
   self.currentAccountModule.delete

src/app/modules/main/browser_section/view.nim

@@ -1,16 +1,20 @@
 import nimqml
 import io_interface
+import ../wallet_section/activity/controller as activity_controller
 
 QtObject:
   type
     View* = ref object of QObject
       delegate: io_interface.AccessInterface
+      activityController: activity_controller.Controller
 
   proc setup(self: View)
   proc delete*(self: View)
-  proc newView*(delegate: io_interface.AccessInterface): View =
+  proc newView*(delegate: io_interface.AccessInterface,
+                activityController: activity_controller.Controller): View =
     new(result, delete)
     result.delegate = delegate
+    result.activityController = activityController
     result.setup()
 
   proc load*(self: View) =
@@ -20,6 +24,12 @@ QtObject:
   proc sendOpenUrlSignal*(self: View, url: string) =
     self.openUrl(url)
 
+  proc getActivityController*(self: View): QVariant {.slot.} =
+    return newQVariant(self.activityController)
+
+  QtProperty[QVariant] activityController:
+    read = getActivityController
+
   proc setup(self: View) =
     self.QObject.setup
 

src/app/modules/main/module.nim

@@ -227,7 +227,7 @@ proc newModule*[T](
   result.browserSectionModule = browser_section_module.newModule(
     result, events, bookmarkService, settingsService, networkService,
     dappPermissionsService, walletAccountService,
-    tokenService, currencyService
+    tokenService, currencyService, savedAddressService
   )
   result.profileSectionModule = profile_section_module.newModule(
     result, events, accountsService, settingsService, stickersService,

storybook/pages/TransactionDelegatePage.qml

@@ -94,7 +94,7 @@ SplitView {
                         }
                     }
                     flatNetworks: NetworksModel.flatNetworks
-                    walletRootStore: WalletStores.RootStore
+                    activityStore: WalletStores.RootStore
                 }
             }
         }

ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml

@@ -7,9 +7,13 @@ import StatusQ
 import StatusQ.Controls
 import StatusQ.Core
 import StatusQ.Core.Theme
+import StatusQ.Core.Utils as SQUtils
+
+import SortFilterProxyModel
 
 import shared.controls
 import shared.views
+import shared.stores as SharedStores
 import utils
 
 import AppLayouts.Browser.stores as BrowserStores
@@ -30,7 +34,7 @@ Dialog {
 
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
     parent: Overlay.overlay
-    width: 360
+    width: 720
     height: 480
     background: Rectangle {
         id: bgPopup
@@ -118,13 +122,24 @@ Dialog {
         target: root.browserWalletStore.dappBrowserAccount
         function onConnectedAccountDeleted() {
             root.reload()
-            // This is done because when an account is deleted and the account is updated to default one,
-            // only the properties are updated and we need to listen to those events and update the selected account
+            // Reset to default account when connected account is deleted
             accountSelectorRow.currentAddress = ""
             accountSelector.selectedAddress = Qt.binding(function () {return root.browserWalletStore.dappBrowserAccount.address})
         }
     }
 
+    Connections {
+        target: browserActivityStore.transactionActivityStatus
+        enabled: root.visible
+        function onIsFilterDirtyChanged() {
+            root.browserWalletStore.updateTransactionFilterIfDirty()
+        }
+        function onFilterChainsChanged() {
+            browserActivityStore.currentActivityFiltersStore.updateCollectiblesModel()
+            browserActivityStore.currentActivityFiltersStore.updateRecipientsModel()
+        }
+    }
+
     Item {
         property string currentAddress: ""
         id: accountSelectorRow
@@ -142,7 +157,6 @@ Dialog {
             selectedAddress: root.browserWalletStore.dappBrowserAccount.address
             onCurrentAccountAddressChanged: {
                 if (!accountSelectorRow.currentAddress) {
-                    // We just set the account for the first time. Nothing to do here
                     accountSelectorRow.currentAddress = currentAccountAddress
                     return
                 }
@@ -153,6 +167,12 @@ Dialog {
                 accountSelectorRow.currentAddress = currentAccountAddress
                 root.browserWalletStore.switchAccountByAddress(currentAccountAddress)
                 root.accountChanged(currentAccountAddress)
+
+                browserActivityStore.activityController.setFilterAddressesJson(
+                    JSON.stringify([currentAccountAddress])
+                )
+                browserActivityStore.activityController.newFilterSession()
+
                 reload()
             }
         }
@@ -182,18 +202,38 @@ Dialog {
         }
     }
 
-    Item {
+    BrowserStores.BrowserActivityStore {
+        id: browserActivityStore
+        browserWalletStore: root.browserWalletStore
+    }
+
+    HistoryView {
         id: walletInfoContent
         width: parent.width
         anchors.top: accountSelectorRow.bottom
         anchors.topMargin: Theme.bigPadding
         anchors.bottom: parent.bottom
 
-        // TODO: Add Assets and History tabs when ready
-        StatusBaseText {
-            anchors.centerIn: parent
-            text: qsTr("Wallet info will appear here")
-            color: Theme.palette.baseColor1
+        activityStore: browserActivityStore
+        overview: root.browserWalletStore.dappBrowserAccount
+        communitiesStore: null
+        currencyStore: SharedStores.CurrenciesStore {}
+        networksStore: SharedStores.NetworksStore {}
+        showAllAccounts: false
+        displayValues: true
+        filterVisible: false
+        disableShadowOnScroll: true
+        hideVerticalScrollbar: false
+
+        Component.onCompleted: {
+            const activeChainIds = SQUtils.ModelUtils.modelToFlatArray(networksStore.activeNetworks, "chainId")
+            if (activeChainIds.length > 0) {
+                browserActivityStore.activityController.setFilterChainsJson(JSON.stringify(activeChainIds), true)
+            }
+
+            const currentAddress = root.browserWalletStore.dappBrowserAccount.address
+            browserActivityStore.activityController.setFilterAddressesJson(JSON.stringify([currentAddress]))
+            browserActivityStore.activityController.newFilterSession()
         }
     }
     onClosed: {

ui/app/AppLayouts/Browser/stores/BrowserActivityStore.qml

@@ -0,0 +1,91 @@
+import QtQuick
+import SortFilterProxyModel
+
+import utils
+
+QtObject {
+    id: root
+
+    required property var browserWalletStore
+
+    readonly property var activityController: browserSection.activityController
+
+    readonly property string selectedAddress: browserWalletStore.dappBrowserAccount.address
+    readonly property bool isNonArchivalNode: false
+    readonly property bool showAllAccounts: false
+    readonly property var transactionActivityStatus: activityController.status
+    readonly property bool loadingHistoryTransactions: activityController.status.loadingData
+    readonly property bool newDataAvailable: activityController.status.newDataAvailable
+
+    // Show only transactions where current account is sender or recipient
+    readonly property var historyTransactions: SortFilterProxyModel {
+        sourceModel: root.activityController.model
+        readonly property bool hasMore: sourceModel ? sourceModel.hasMore : false
+        filters: ExpressionFilter {
+            expression: {
+                const currentAddr = root.browserWalletStore.dappBrowserAccount.address.toLowerCase()
+                if (!model.activityEntry) return false
+                const sender = model.activityEntry.sender ? model.activityEntry.sender.toLowerCase() : ""
+                const recipient = model.activityEntry.recipient ? model.activityEntry.recipient.toLowerCase() : ""
+                return sender === currentAddr || recipient === currentAddr
+            }
+        }
+    }
+
+    // Browser view doesn't provide transaction filtering UI
+    readonly property QtObject currentActivityFiltersStore: QtObject {
+        readonly property bool filtersSet: false
+
+        function applyAllFilters() {
+            root.activityController.updateFilter()
+        }
+
+        function updateCollectiblesModel() {
+            root.activityController.updateCollectiblesModel()
+        }
+
+        function updateRecipientsModel() {
+            root.activityController.updateRecipientsModel()
+        }
+    }
+
+    function updateTransactionFilterIfDirty() {
+        if (transactionActivityStatus.isFilterDirty) {
+            activityController.updateFilter()
+        }
+    }
+
+    function fetchMoreTransactions() {
+        if (historyTransactions.count === 0
+                || !historyTransactions.hasMore
+                || loadingHistoryTransactions)
+            return
+        activityController.loadMoreItems()
+    }
+
+    function resetActivityData() {
+        activityController.resetActivityData()
+    }
+
+    function getEtherscanLink(chainID) {
+        return networksModule.getBlockExplorerTxURL(chainID)
+    }
+
+    function getTransactionType(transaction) {
+        if (!transaction) return Constants.TransactionType.Send
+        return transaction.txType
+    }
+
+    function getNameForAddress(address) {
+        const name = walletSectionAccounts.getNameByAddress(address)
+        return name.length > 0 ? name : ""
+    }
+
+    function getDappDetails(chainId, contractAddress) {
+        return undefined
+    }
+
+    function isOwnedAccount(address) {
+        return walletSectionAccounts.isOwnedAccount(address)
+    }
+}

ui/app/AppLayouts/Browser/stores/BrowserWalletStore.qml

@@ -8,10 +8,6 @@ QtObject {
     property string defaultCurrency: walletSection.currentCurrency
     property string signingPhrase: walletSection.signingPhrase // FIXME
 
-    function getEtherscanLink(chainID) {
-        return networksModule.getBlockExplorerTxURL(chainID)
-    }
-
     function switchAccountByAddress(address) {
         browserSectionCurrentAccount.switchAccountByAddress(address)
     }

ui/app/AppLayouts/Browser/stores/qmldir

@@ -1,4 +1,5 @@
 BrowserRootStore 1.0 BrowserRootStore.qml
 BrowserWalletStore 1.0 BrowserWalletStore.qml
+BrowserActivityStore 1.0 BrowserActivityStore.qml
 BookmarksStore 1.0 BookmarksStore.qml
 DownloadsStore 1.0 DownloadsStore.qml

ui/app/AppLayouts/Wallet/popups/SavedAddressActivityPopup.qml

@@ -269,7 +269,7 @@ StatusModal {
                            isWatchOnlyAccount: false,
                            mixedcaseAddress: d.address
                        })
-            walletRootStore: WalletStore.RootStore
+            activityStore: WalletStore.RootStore
             networksStore: root.networksStore
         }
     }

ui/app/AppLayouts/Wallet/views/RightTabView.qml

@@ -532,7 +532,7 @@ RightTabBaseView {
                     id: historyView
                     HistoryView {
                         overview: RootStore.overview
-                        walletRootStore: RootStore
+                        activityStore: RootStore
                         communitiesStore: root.communitiesStore
                         currencyStore: root.sharedRootStore.currencyStore
                         networksStore: root.networksStore