diff --git a/src/app/boot/app_controller.nim b/src/app/boot/app_controller.nim index ac772c29bb..bd805af08e 100644 --- a/src/app/boot/app_controller.nim +++ b/src/app/boot/app_controller.nim @@ -477,7 +477,7 @@ proc finishAppLoading*(self: AppController) = self.privacyService.removeMnemonic() if not self.startupModule.isNil: - self.startupModule.onAppLoaded() + self.startupModule.delete self.startupModule = nil self.mainModule.checkAndPerformProfileMigrationIfNeeded() diff --git a/src/app/modules/main/wallet_section/send/account_item.nim b/src/app/modules/main/wallet_section/send/account_item.nim index dfe410a8e6..2862653e41 100644 --- a/src/app/modules/main/wallet_section/send/account_item.nim +++ b/src/app/modules/main/wallet_section/send/account_item.nim @@ -44,7 +44,7 @@ QtObject: self.canSend = canSend proc delete*(self: AccountItem) = - self.QObject.delete + self.QObject.delete proc newAccountItem*( name: string = "", diff --git a/src/app/modules/main/wallet_section/send/view.nim b/src/app/modules/main/wallet_section/send/view.nim index b534f1ef39..570ac23137 100644 --- a/src/app/modules/main/wallet_section/send/view.nim +++ b/src/app/modules/main/wallet_section/send/view.nim @@ -35,13 +35,11 @@ QtObject: proc delete*(self: View) = self.accounts.delete self.senderAccounts.delete - if self.selectedSenderAccount != nil: - self.selectedSenderAccount.delete + self.selectedSenderAccount.delete self.fromNetworksModel.delete self.toNetworksModel.delete self.transactionRoutes.delete - if self.selectedSenderAccount != nil: - self.selectedReceiveAccount.delete + self.selectedReceiveAccount.delete self.QObject.delete proc newView*(delegate: io_interface.AccessInterface): View = diff --git a/src/app/modules/startup/io_interface.nim b/src/app/modules/startup/io_interface.nim index 261e8ebcf8..8cbf2ebc1d 100644 --- a/src/app/modules/startup/io_interface.nim +++ b/src/app/modules/startup/io_interface.nim @@ -19,9 +19,6 @@ type method delete*(self: AccessInterface) {.base.} = raise newException(ValueError, "No implementation available") -method onAppLoaded*(self: AccessInterface) {.base.} = - raise newException(ValueError, "No implementation available") - method load*(self: AccessInterface) {.base.} = raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/startup/module.nim b/src/app/modules/startup/module.nim index 03be358c3c..464c388972 100644 --- a/src/app/modules/startup/module.nim +++ b/src/app/modules/startup/module.nim @@ -84,13 +84,6 @@ proc newModule*[T](delegate: T, {.push warning[Deprecated]: off.} method delete*[T](self: Module[T]) = - self.view.delete - self.viewVariant.delete - self.controller.delete - if not self.keycardSharedModule.isNil: - self.keycardSharedModule.delete - -method onAppLoaded*[T](self: Module[T]) = singletonInstance.engine.setRootContextProperty("startupModule", newQVariant()) self.view.delete self.view = nil