Fix rebase

This commit is contained in:
Anthony Laibe 2021-10-19 09:19:03 +02:00 committed by Iuri Matias
parent a876a4b9ce
commit 072b36e672
3 changed files with 16 additions and 4 deletions

View File

@ -71,6 +71,7 @@ type
localAccountSettings: LocalAccountSettings
localAccountSettingsVariant: QVariant
mainModule: main_module.AccessInterface
startupModule: startup_module.AccessInterface
#################################################
# At the end of refactoring this will be moved to
@ -128,9 +129,13 @@ proc newAppController*(appService: AppService): AppController =
result.localAccountSettingsVariant = newQVariant(
singletonInstance.localAccountSettings)
# Modules
result.startupModule = startup_module.newModule[AppController](result,
appService.status.events, appService.status.fleet, result.keychainService,
result.accountsService)
result.startupModule = startup_module.newModule[AppController](
result,
appService.status.events,
appService.status.fleet,
result.keychainService,
result.accountsService
)
result.mainModule = main_module.newModule[AppController](
result,
appService.status.events,
@ -169,6 +174,10 @@ proc delete*(self: AppController) =
self.contactService.delete
self.chatService.delete
self.communityService.delete
self.tokenService.delete
self.transactionService.delete
self.collectibleService.delete
self.walletAccountService.delete
proc startupDidLoad*(self: AppController) =
#################################################

View File

@ -103,6 +103,9 @@ method load*[T](self: Module[T]) =
cModule.load()
self.walletSectionModule.load()
let walletSectionItem = initItem("wallet", ChatSectionType.Wallet.int, "Wallet", "",
"wallet", "", 0, 0)
self.view.addItem(chatSectionItem)
proc checkIfModuleDidLoad [T](self: Module[T]) =

2
vendor/status-lib vendored

@ -1 +1 @@
Subproject commit 2a3f48f46979b6300160e9fd982dd678a1ad2a58
Subproject commit a507f8b579756e149c09bec026dccb3e687d024a