From 200c0b337f3a673a63a00382c1f18a75387584c6 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Sat, 18 Nov 2023 01:10:14 +0000 Subject: [PATCH] chore: remove nim unused imports (#12783) --- src/app/modules/main/activity_center/controller.nim | 3 +-- src/app/modules/main/activity_center/io_interface.nim | 2 +- src/app/modules/main/activity_center/item.nim | 2 +- src/app/modules/main/activity_center/model.nim | 2 +- src/app/modules/main/activity_center/module.nim | 4 +--- src/app/modules/main/activity_center/view.nim | 2 +- src/app/modules/main/app_search/module.nim | 2 +- src/app/modules/main/browser_section/dapps/module.nim | 4 ++-- .../main/chat_section/chat_content/messages/controller.nim | 1 - src/app/modules/main/chat_section/controller.nim | 2 +- src/app/modules/main/chat_section/model.nim | 2 +- src/app/modules/main/chat_section/module.nim | 2 -- src/app/modules/main/communities/controller.nim | 1 - .../main/communities/models/curated_community_model.nim | 2 +- .../modules/main/communities/tokens/models/token_item.nim | 1 - src/app/modules/main/communities/tokens/module.nim | 4 +--- src/app/modules/main/controller.nim | 2 +- src/app/modules/main/network_connection/controller.nim | 2 -- src/app/modules/main/network_connection/io_interface.nim | 2 -- src/app/modules/main/node_section/io_interface.nim | 1 - src/app/modules/main/node_section/module.nim | 2 +- src/app/modules/main/node_section/view.nim | 2 +- src/app/modules/main/profile_section/advanced/module.nim | 5 ++--- .../modules/main/profile_section/communities/module.nim | 3 +-- .../modules/main/profile_section/devices/controller.nim | 2 +- src/app/modules/main/profile_section/devices/model.nim | 2 +- src/app/modules/main/profile_section/devices/module.nim | 1 - .../main/profile_section/ens_usernames/controller.nim | 2 +- src/app/modules/main/profile_section/keycard/module.nim | 2 +- src/app/modules/main/profile_section/language/module.nim | 3 +-- .../main/profile_section/notifications/io_interface.nim | 3 +-- .../modules/main/profile_section/notifications/module.nim | 5 ++--- .../modules/main/profile_section/profile/controller.nim | 2 -- src/app/modules/main/profile_section/profile/module.nim | 1 - src/app/modules/main/profile_section/waku/controller.nim | 5 ++--- .../main/profile_section/wallet/accounts/controller.nim | 1 - .../main/profile_section/wallet/accounts/module.nim | 3 +-- .../modules/main/profile_section/wallet/accounts/view.nim | 2 +- .../main/profile_section/wallet/networks/module.nim | 2 +- .../modules/main/profile_section/wallet/networks/view.nim | 2 +- src/app/modules/main/shared_urls/controller.nim | 1 - src/app/modules/main/shared_urls/io_interface.nim | 4 +--- src/app/modules/main/shared_urls/module.nim | 4 ++-- src/app/modules/main/stickers/controller.nim | 1 - src/app/modules/main/stickers/io_interface.nim | 1 - src/app/modules/main/stickers/module.nim | 2 +- src/app/modules/main/stickers/view.nim | 3 +-- .../modules/main/wallet_section/accounts/controller.nim | 4 +--- .../modules/main/wallet_section/accounts/io_interface.nim | 2 -- src/app/modules/main/wallet_section/accounts/item.nim | 1 - src/app/modules/main/wallet_section/accounts/model.nim | 3 +-- src/app/modules/main/wallet_section/accounts/module.nim | 7 ++----- src/app/modules/main/wallet_section/accounts/view.nim | 2 +- .../modules/main/wallet_section/activity/controller.nim | 2 +- src/app/modules/main/wallet_section/activity/entry.nim | 1 - .../main/wallet_section/activity/events_handler.nim | 4 ++-- .../modules/main/wallet_section/all_tokens/controller.nim | 2 -- src/app/modules/main/wallet_section/all_tokens/module.nim | 2 +- src/app/modules/main/wallet_section/all_tokens/view.nim | 2 +- src/app/modules/main/wallet_section/assets/controller.nim | 4 ++-- src/app/modules/main/wallet_section/assets/item.nim | 1 - src/app/modules/main/wallet_section/assets/module.nim | 6 ++---- src/app/modules/main/wallet_section/assets/view.nim | 5 ++--- .../main/wallet_section/buy_sell_crypto/controller.nim | 1 - .../modules/main/wallet_section/buy_sell_crypto/item.nim | 2 +- .../modules/main/wallet_section/buy_sell_crypto/module.nim | 2 +- .../modules/main/wallet_section/networks/io_interface.nim | 4 +--- src/app/modules/main/wallet_section/networks/module.nim | 2 +- src/app/modules/main/wallet_section/networks/view.nim | 2 +- .../modules/main/wallet_section/overview/controller.nim | 3 +-- src/app/modules/main/wallet_section/overview/module.nim | 4 +--- src/app/modules/main/wallet_section/send/account_item.nim | 4 ++-- src/app/modules/main/wallet_section/send/gas_fees_item.nim | 2 +- src/app/modules/main/wallet_section/send/module.nim | 3 +-- .../main/wallet_section/send/suggested_route_item.nim | 2 +- src/app/modules/shared/keypairs.nim | 2 +- src/app/modules/shared_models/collectibles_model.nim | 4 +--- src/app/modules/shared_models/collectibles_nested_item.nim | 2 +- .../modules/shared_models/collectibles_nested_model.nim | 4 ++-- .../modules/shared_models/collectibles_nested_utils.nim | 1 - src/app/modules/shared_models/collectibles_utils.nim | 2 +- src/app/modules/shared_models/link_preview_item.nim | 2 -- src/app/modules/shared_models/link_preview_model.nim | 1 - src/app/modules/shared_models/message_item_qobject.nim | 4 ++-- src/app/modules/shared_models/token_item.nim | 1 - src/app/modules/shared_modules/keycard_popup/module.nim | 2 +- .../modules/shared_modules/keypair_import/io_interface.nim | 4 ++-- src/app/modules/startup/module.nim | 2 +- src/app_service/common/network_constants.nim | 2 +- src/app_service/service/community/dto/community.nim | 1 - src/app_service/service/community/service.nim | 1 - .../community_tokens/community_collectible_owner.nim | 1 - src/app_service/service/contacts/service.nim | 2 +- src/app_service/service/ens/service.nim | 4 +--- src/app_service/service/message/async_tasks.nim | 2 +- src/app_service/service/message/dto/link_preview.nim | 2 +- .../service/message/dto/status_link_preview.nim | 3 +-- src/app_service/service/message/service.nim | 3 +-- src/app_service/service/profile/async_tasks.nim | 2 +- src/app_service/service/profile/dto/profile_showcase.nim | 2 +- .../service/profile/dto/profile_showcase_preferences.nim | 2 +- src/app_service/service/profile/service.nim | 2 +- src/app_service/service/shared_urls/dto/url_data.nim | 2 +- src/app_service/service/shared_urls/service.nim | 5 ++--- src/app_service/service/token/service.nim | 2 +- src/app_service/service/token/service_items.nim | 2 +- src/app_service/service/transaction/async_tasks.nim | 1 - src/app_service/service/transaction/service.nim | 1 - src/app_service/service/wallet_account/dto/token_dto.nim | 2 +- src/backend/chat.nim | 3 --- src/backend/community_tokens.nim | 3 +-- src/backend/messages.nim | 2 +- src/backend/privacy.nim | 1 - src/backend/transactions.nim | 1 - 114 files changed, 97 insertions(+), 176 deletions(-) diff --git a/src/app/modules/main/activity_center/controller.nim b/src/app/modules/main/activity_center/controller.nim index 86c2bb2f09..b61efa7803 100644 --- a/src/app/modules/main/activity_center/controller.nim +++ b/src/app/modules/main/activity_center/controller.nim @@ -1,4 +1,4 @@ -import Tables, stint +import stint import ./io_interface import ../../../global/app_signals @@ -7,7 +7,6 @@ import ../../../../app_service/service/activity_center/service as activity_cente import ../../../../app_service/service/contacts/service as contacts_service import ../../../../app_service/service/message/service as message_service import ../../../../app_service/service/community/service as community_service -import ../../../../app_service/service/eth/utils as eth_utils import ../../../../app_service/service/chat/service as chat_service type diff --git a/src/app/modules/main/activity_center/io_interface.nim b/src/app/modules/main/activity_center/io_interface.nim index f3972bab9e..d92eb70a81 100644 --- a/src/app/modules/main/activity_center/io_interface.nim +++ b/src/app/modules/main/activity_center/io_interface.nim @@ -1,4 +1,4 @@ -import Tables, stint +import Tables import ./item import ../../../../app_service/service/activity_center/service as activity_center_service diff --git a/src/app/modules/main/activity_center/item.nim b/src/app/modules/main/activity_center/item.nim index 26c3072c4d..7b80d67dc5 100644 --- a/src/app/modules/main/activity_center/item.nim +++ b/src/app/modules/main/activity_center/item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import strformat import ../../shared_models/message_item_qobject import ../../../../app_service/service/activity_center/dto/notification import ../../../../app_service/service/chat/dto/chat diff --git a/src/app/modules/main/activity_center/model.nim b/src/app/modules/main/activity_center/model.nim index 3ff242ce6b..b2b3085b9b 100644 --- a/src/app/modules/main/activity_center/model.nim +++ b/src/app/modules/main/activity_center/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, chronicles, json, sequtils, strformat, strutils +import NimQml, Tables, json, sequtils, strutils import ./item type diff --git a/src/app/modules/main/activity_center/module.nim b/src/app/modules/main/activity_center/module.nim index 507b3a7432..39321be258 100644 --- a/src/app/modules/main/activity_center/module.nim +++ b/src/app/modules/main/activity_center/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, stint, sugar, sequtils +import NimQml, Tables, json, stint, sequtils import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface @@ -14,8 +14,6 @@ import ../../../../app_service/service/message/service as message_service import ../../../../app_service/service/chat/service as chat_service import ../../../../app_service/service/community/service as community_service -import ../../../global/app_sections_config as conf - export io_interface type diff --git a/src/app/modules/main/activity_center/view.nim b/src/app/modules/main/activity_center/view.nim index 81e340fec6..d12abcb93b 100644 --- a/src/app/modules/main/activity_center/view.nim +++ b/src/app/modules/main/activity_center/view.nim @@ -1,4 +1,4 @@ -import NimQml, json, strutils, json_serialization, sequtils, strformat, std/tables +import NimQml, json, strutils, sequtils, strformat, std/tables import ../../../../app_service/service/activity_center/service as activity_center_service import ./model diff --git a/src/app/modules/main/app_search/module.nim b/src/app/modules/main/app_search/module.nim index 41dae655bc..8a78d25ea1 100644 --- a/src/app/modules/main/app_search/module.nim +++ b/src/app/modules/main/app_search/module.nim @@ -4,7 +4,7 @@ import io_interface import ../io_interface as delegate_interface import view, controller import location_menu_model, location_menu_item -import location_menu_sub_model, location_menu_sub_item +import location_menu_sub_item import result_model, result_item import ../../shared_models/message_item diff --git a/src/app/modules/main/browser_section/dapps/module.nim b/src/app/modules/main/browser_section/dapps/module.nim index 5b1a4cd4c7..6e3fbc91a9 100644 --- a/src/app/modules/main/browser_section/dapps/module.nim +++ b/src/app/modules/main/browser_section/dapps/module.nim @@ -9,7 +9,7 @@ import controller import ../../../../global/global_singleton import ../../../../../app_service/service/dapp_permissions/service as dapp_permissions_service import ../../../../../app_service/service/wallet_account/service as wallet_account_service -import options + export io_interface type @@ -108,4 +108,4 @@ method disconnectAddress*(self: Module, dapp: string, address: string) = method disconnect*(self: Module, dapp: string) = self.controller.disconnect(dapp) - self.fetchDapps() \ No newline at end of file + self.fetchDapps() diff --git a/src/app/modules/main/chat_section/chat_content/messages/controller.nim b/src/app/modules/main/chat_section/chat_content/messages/controller.nim index 7201aefa3b..ee617bd280 100644 --- a/src/app/modules/main/chat_section/chat_content/messages/controller.nim +++ b/src/app/modules/main/chat_section/chat_content/messages/controller.nim @@ -1,6 +1,5 @@ import chronicles, uuids, times import io_interface -import json import ../../../../../../app/global/global_singleton import ../../../../../../app_service/service/contacts/service as contact_service diff --git a/src/app/modules/main/chat_section/controller.nim b/src/app/modules/main/chat_section/controller.nim index e465a93027..faee2bbb9b 100644 --- a/src/app/modules/main/chat_section/controller.nim +++ b/src/app/modules/main/chat_section/controller.nim @@ -1,4 +1,4 @@ -import Tables, sugar, sequtils, strutils +import Tables import io_interface diff --git a/src/app/modules/main/chat_section/model.nim b/src/app/modules/main/chat_section/model.nim index 379159f320..d61c2f367c 100644 --- a/src/app/modules/main/chat_section/model.nim +++ b/src/app/modules/main/chat_section/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, json, sequtils, algorithm +import NimQml, Tables, strutils, strformat, json, sequtils import ../../../../app_service/common/types import ../../../../app_service/service/chat/dto/chat from ../../../../app_service/service/contacts/dto/contacts import TrustStatus diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim index 97adaf4153..efa7b4b994 100644 --- a/src/app/modules/main/chat_section/module.nim +++ b/src/app/modules/main/chat_section/module.nim @@ -14,9 +14,7 @@ import ../../shared_models/token_criteria_model import ../../shared_models/token_permission_chat_list_model import chat_content/module as chat_content_module -import chat_content/users/module as users_module -import ../../../global/app_sections_config as conf import ../../../global/global_singleton import ../../../core/eventemitter import ../../../core/unique_event_emitter diff --git a/src/app/modules/main/communities/controller.nim b/src/app/modules/main/communities/controller.nim index e03d300eee..fbe4ccf2b4 100644 --- a/src/app/modules/main/communities/controller.nim +++ b/src/app/modules/main/communities/controller.nim @@ -13,7 +13,6 @@ import app_service/service/token/service as token_service import app_service/service/wallet_account/service as wallet_account_service import app_service/service/keycard/service as keycard_service import app_service/common/types -import backend/collectibles as backend_collectibles import app/modules/shared_modules/keycard_popup/io_interface as keycard_shared_module const UNIQUE_COMMUNITIES_MODULE_AUTH_IDENTIFIER* = "CommunitiesModule-Authentication" diff --git a/src/app/modules/main/communities/models/curated_community_model.nim b/src/app/modules/main/communities/models/curated_community_model.nim index 77023ba30f..332137399e 100644 --- a/src/app/modules/main/communities/models/curated_community_model.nim +++ b/src/app/modules/main/communities/models/curated_community_model.nim @@ -1,6 +1,6 @@ import NimQml, Tables import curated_community_item -import ../../../shared_models/[token_permissions_model, token_permission_item] +import ../../../shared_models/token_permission_item type ModelRole {.pure.} = enum diff --git a/src/app/modules/main/communities/tokens/models/token_item.nim b/src/app/modules/main/communities/tokens/models/token_item.nim index 4cf742b37d..8952cc6b2a 100644 --- a/src/app/modules/main/communities/tokens/models/token_item.nim +++ b/src/app/modules/main/communities/tokens/models/token_item.nim @@ -3,7 +3,6 @@ import ../../../../../../app_service/service/community_tokens/dto/community_toke import ../../../../../../app_service/service/community_tokens/community_collectible_owner import ../../../../../../app_service/service/network/dto import ../../../../../../app_service/common/types -from backend/collectibles_types import CollectibleOwner import token_owners_model import token_owners_item diff --git a/src/app/modules/main/communities/tokens/module.nim b/src/app/modules/main/communities/tokens/module.nim index ec5e8624bf..e8d48f3960 100644 --- a/src/app/modules/main/communities/tokens/module.nim +++ b/src/app/modules/main/communities/tokens/module.nim @@ -6,9 +6,7 @@ import ../../../../../app_service/service/network/service as networks_service import ../../../../../app_service/service/community/service as community_service import ../../../../../app_service/service/community/dto/community import ../../../../../app_service/service/accounts/utils as utl -import ../../../../../app_service/common/conversion import ../../../../../app_service/common/types -import ../../../../../app_service/common/utils as common_utils import ../../../../core/eventemitter import ../../../../global/global_singleton import ../../../shared_models/currency_amount @@ -374,4 +372,4 @@ method onOwnerTokenOwnerAddress*(self: Module, chainId: int, contractAddress: st "chainId": chainId, "contractAddress": contractAddress } - self.view.setOwnerTokenDetails($jsonObj) \ No newline at end of file + self.view.setOwnerTokenDetails($jsonObj) diff --git a/src/app/modules/main/controller.nim b/src/app/modules/main/controller.nim index e8296d7855..b52177f19f 100644 --- a/src/app/modules/main/controller.nim +++ b/src/app/modules/main/controller.nim @@ -1,4 +1,4 @@ -import chronicles, stint, tables +import chronicles, stint import app/global/app_sections_config as conf import app/global/global_singleton import app/global/app_signals diff --git a/src/app/modules/main/network_connection/controller.nim b/src/app/modules/main/network_connection/controller.nim index b44be89362..86feec6629 100644 --- a/src/app/modules/main/network_connection/controller.nim +++ b/src/app/modules/main/network_connection/controller.nim @@ -1,5 +1,3 @@ -import NimQml - import ./io_interface import ../../../core/eventemitter import ../../../../app_service/service/network_connection/service as network_connection_service diff --git a/src/app/modules/main/network_connection/io_interface.nim b/src/app/modules/main/network_connection/io_interface.nim index e584c1b06b..2d9d856410 100644 --- a/src/app/modules/main/network_connection/io_interface.nim +++ b/src/app/modules/main/network_connection/io_interface.nim @@ -1,5 +1,3 @@ -import NimQml - type AccessInterface* {.pure inheritable.} = ref object of RootObj ## Abstract class for any input/interaction with this module. diff --git a/src/app/modules/main/node_section/io_interface.nim b/src/app/modules/main/node_section/io_interface.nim index 70e2b551db..9bbdfc9e93 100644 --- a/src/app/modules/main/node_section/io_interface.nim +++ b/src/app/modules/main/node_section/io_interface.nim @@ -1,4 +1,3 @@ -import json import ../../../core/signals/types type diff --git a/src/app/modules/main/node_section/module.nim b/src/app/modules/main/node_section/module.nim index 004e7069dc..4574da177b 100644 --- a/src/app/modules/main/node_section/module.nim +++ b/src/app/modules/main/node_section/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json +import NimQml import io_interface import ../io_interface as delegate_interface diff --git a/src/app/modules/main/node_section/view.nim b/src/app/modules/main/node_section/view.nim index abae189d77..0e74699b1c 100644 --- a/src/app/modules/main/node_section/view.nim +++ b/src/app/modules/main/node_section/view.nim @@ -1,4 +1,4 @@ -import NimQml, chronicles, json, strutils +import NimQml, json, strutils import io_interface import ../../../core/signals/types diff --git a/src/app/modules/main/profile_section/advanced/module.nim b/src/app/modules/main/profile_section/advanced/module.nim index 1f094323d2..2d52c45a87 100644 --- a/src/app/modules/main/profile_section/advanced/module.nim +++ b/src/app/modules/main/profile_section/advanced/module.nim @@ -1,11 +1,10 @@ -import NimQml, chronicles, uuids +import NimQml, chronicles import io_interface import ../io_interface as delegate_interface import view, controller import ../../../../../constants import ../../../../core/eventemitter -import ../../../../global/global_singleton import ../../../../../app_service/service/settings/service as settings_service import ../../../../../app_service/service/stickers/service as stickers_service import ../../../../../app_service/service/node_configuration/service as node_configuration_service @@ -147,4 +146,4 @@ method setMaxLogBackups*(self: Module, value: int) = self.controller.setMaxLogBackups(value) method onLogMaxBackupsChanged*(self: Module) = - self.view.logMaxBackupsChanged() \ No newline at end of file + self.view.logMaxBackupsChanged() diff --git a/src/app/modules/main/profile_section/communities/module.nim b/src/app/modules/main/profile_section/communities/module.nim index cc507c4feb..b1fa3a9e88 100644 --- a/src/app/modules/main/profile_section/communities/module.nim +++ b/src/app/modules/main/profile_section/communities/module.nim @@ -1,9 +1,8 @@ -import NimQml, chronicles +import NimQml import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface -import ../../../../core/eventemitter import ../../../../../app_service/service/community/service as community_service export io_interface diff --git a/src/app/modules/main/profile_section/devices/controller.nim b/src/app/modules/main/profile_section/devices/controller.nim index cae7a305ee..0ac02a2ed4 100644 --- a/src/app/modules/main/profile_section/devices/controller.nim +++ b/src/app/modules/main/profile_section/devices/controller.nim @@ -1,4 +1,4 @@ -import Tables, chronicles +import chronicles import io_interface import app/core/eventemitter diff --git a/src/app/modules/main/profile_section/devices/model.nim b/src/app/modules/main/profile_section/devices/model.nim index d11f9f2225..c2d9bc5e52 100644 --- a/src/app/modules/main/profile_section/devices/model.nim +++ b/src/app/modules/main/profile_section/devices/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, sequtils, chronicles +import NimQml, Tables, sequtils import item import ../../../../../app_service/service/devices/dto/[installation] diff --git a/src/app/modules/main/profile_section/devices/module.nim b/src/app/modules/main/profile_section/devices/module.nim index 6b1b57cd07..1189899b76 100644 --- a/src/app/modules/main/profile_section/devices/module.nim +++ b/src/app/modules/main/profile_section/devices/module.nim @@ -2,7 +2,6 @@ import NimQml, tables, strutils, chronicles import io_interface import ../io_interface as delegate_interface import view, controller, model, item -import logging import app/global/global_singleton import app/core/eventemitter diff --git a/src/app/modules/main/profile_section/ens_usernames/controller.nim b/src/app/modules/main/profile_section/ens_usernames/controller.nim index 9334a53d3c..198b2cfaf5 100644 --- a/src/app/modules/main/profile_section/ens_usernames/controller.nim +++ b/src/app/modules/main/profile_section/ens_usernames/controller.nim @@ -1,4 +1,4 @@ -import Tables, chronicles, json +import chronicles, json import io_interface import ../../../../global/global_singleton diff --git a/src/app/modules/main/profile_section/keycard/module.nim b/src/app/modules/main/profile_section/keycard/module.nim index 7c36a8ec92..3fd228e8bd 100644 --- a/src/app/modules/main/profile_section/keycard/module.nim +++ b/src/app/modules/main/profile_section/keycard/module.nim @@ -1,4 +1,4 @@ -import NimQml, chronicles, json, marshal, sequtils, sugar, strutils +import NimQml, chronicles, sequtils, sugar, strutils import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface diff --git a/src/app/modules/main/profile_section/language/module.nim b/src/app/modules/main/profile_section/language/module.nim index 4240875b2c..9bdd74dfb1 100644 --- a/src/app/modules/main/profile_section/language/module.nim +++ b/src/app/modules/main/profile_section/language/module.nim @@ -1,8 +1,7 @@ -import NimQml, tables, sequtils, sugar, chronicles +import NimQml, tables, chronicles import io_interface, view, controller, item, model, locale_table import ../io_interface as delegate_interface -import ../../../../global/global_singleton import ../../../../../app/core/eventemitter import ../../../../../app_service/service/language/service as language_service diff --git a/src/app/modules/main/profile_section/notifications/io_interface.nim b/src/app/modules/main/profile_section/notifications/io_interface.nim index 146ff86f26..c63f286a67 100644 --- a/src/app/modules/main/profile_section/notifications/io_interface.nim +++ b/src/app/modules/main/profile_section/notifications/io_interface.nim @@ -1,5 +1,4 @@ import NimQml -import ../../../../global/app_signals from ../../../../../app_service/service/community/dto/community import CommunityDto from ../../../../../app_service/service/chat/dto/chat import ChatDto @@ -44,4 +43,4 @@ method addChat*(self: AccessInterface, itemId: string) {.base.} = raise newException(ValueError, "No implementation available") method setName*(self: AccessInterface, itemId: string, name: string) {.base.} = - raise newException(ValueError, "No implementation available") \ No newline at end of file + raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/main/profile_section/notifications/module.nim b/src/app/modules/main/profile_section/notifications/module.nim index 447b0dd023..77946b0905 100644 --- a/src/app/modules/main/profile_section/notifications/module.nim +++ b/src/app/modules/main/profile_section/notifications/module.nim @@ -1,9 +1,8 @@ -import NimQml, algorithm, json, chronicles +import NimQml, algorithm, chronicles import io_interface import ../io_interface as delegate_interface import view, controller, model, item -import ../../../../global/app_signals import ../../../../global/global_singleton import ../../../../core/eventemitter import ../../../../../app_service/service/settings/service as settings_service @@ -146,4 +145,4 @@ method addChat*(self: Module, itemId: string) = self.addChat(chatDto) method setName*(self: Module, itemId: string, name: string) = - self.view.exemptionsModel().updateName(itemId, name) \ No newline at end of file + self.view.exemptionsModel().updateName(itemId, name) diff --git a/src/app/modules/main/profile_section/profile/controller.nim b/src/app/modules/main/profile_section/profile/controller.nim index cf011d165f..1e9946893a 100644 --- a/src/app/modules/main/profile_section/profile/controller.nim +++ b/src/app/modules/main/profile_section/profile/controller.nim @@ -1,5 +1,3 @@ -import json, sugar, sequtils - import io_interface import app/core/eventemitter diff --git a/src/app/modules/main/profile_section/profile/module.nim b/src/app/modules/main/profile_section/profile/module.nim index fb973a8ffc..73369ee7db 100644 --- a/src/app/modules/main/profile_section/profile/module.nim +++ b/src/app/modules/main/profile_section/profile/module.nim @@ -11,7 +11,6 @@ import app_service/service/community/service as community_service import app_service/service/wallet_account/service as wallet_account_service import app_service/service/profile/dto/profile_showcase import app_service/service/profile/dto/profile_showcase_preferences -import app_service/common/types import app_service/common/social_links import app/modules/shared_models/social_links_model diff --git a/src/app/modules/main/profile_section/waku/controller.nim b/src/app/modules/main/profile_section/waku/controller.nim index 63c40fdecb..5f002b7d8c 100644 --- a/src/app/modules/main/profile_section/waku/controller.nim +++ b/src/app/modules/main/profile_section/waku/controller.nim @@ -1,8 +1,7 @@ -import Tables, chronicles +import chronicles import io_interface import ../../../../core/eventemitter -import ../../../../core/fleets/fleet_configuration import ../../../../../app_service/service/settings/service as settings_service import ../../../../../app_service/service/node_configuration/service as node_configuration_service @@ -36,4 +35,4 @@ proc getAllWakuNodes*(self: Controller): seq[string] = return self.nodeConfigurationService.getAllWakuNodes() proc saveNewWakuNode*(self: Controller, nodeAddress: string) = - self.nodeConfigurationService.saveNewWakuNode(nodeAddress) \ No newline at end of file + self.nodeConfigurationService.saveNewWakuNode(nodeAddress) diff --git a/src/app/modules/main/profile_section/wallet/accounts/controller.nim b/src/app/modules/main/profile_section/wallet/accounts/controller.nim index 58c0e98d0c..9feb62d8e0 100644 --- a/src/app/modules/main/profile_section/wallet/accounts/controller.nim +++ b/src/app/modules/main/profile_section/wallet/accounts/controller.nim @@ -1,7 +1,6 @@ import io_interface import app_service/service/wallet_account/service as wallet_account_service import app_service/service/currency/dto -import app/modules/shared_modules/keycard_popup/io_interface as keycard_shared_module type Controller* = ref object of RootObj diff --git a/src/app/modules/main/profile_section/wallet/accounts/module.nim b/src/app/modules/main/profile_section/wallet/accounts/module.nim index dda0190d5b..3f6dc0dc5d 100644 --- a/src/app/modules/main/profile_section/wallet/accounts/module.nim +++ b/src/app/modules/main/profile_section/wallet/accounts/module.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, sugar, chronicles, tables +import NimQml, sequtils, sugar, tables import ./io_interface, ./view import ./controller as accountsc @@ -9,7 +9,6 @@ import app/modules/shared_models/[keypair_model, currency_amount] import app/modules/shared_modules/collectibles/controller as collectiblesc import app/global/global_singleton import app/core/eventemitter -import app_service/service/keycard/service as keycard_service import app_service/service/wallet_account/service as wallet_account_service import app_service/service/network/service as network_service import app_service/service/settings/service diff --git a/src/app/modules/main/profile_section/wallet/accounts/view.nim b/src/app/modules/main/profile_section/wallet/accounts/view.nim index 8eb3c381ef..fc87f7198c 100644 --- a/src/app/modules/main/profile_section/wallet/accounts/view.nim +++ b/src/app/modules/main/profile_section/wallet/accounts/view.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, strutils, sugar +import NimQml, sequtils, strutils import ./io_interface import ./model diff --git a/src/app/modules/main/profile_section/wallet/networks/module.nim b/src/app/modules/main/profile_section/wallet/networks/module.nim index d262479a97..021a4ebe92 100644 --- a/src/app/modules/main/profile_section/wallet/networks/module.nim +++ b/src/app/modules/main/profile_section/wallet/networks/module.nim @@ -1,4 +1,4 @@ -import Tables, NimQml +import NimQml import ../io_interface as delegate_interface import io_interface, view, controller, combined_item, item import ../../../../../core/eventemitter diff --git a/src/app/modules/main/profile_section/wallet/networks/view.nim b/src/app/modules/main/profile_section/wallet/networks/view.nim index 6e86c96e1b..662b4eacfb 100644 --- a/src/app/modules/main/profile_section/wallet/networks/view.nim +++ b/src/app/modules/main/profile_section/wallet/networks/view.nim @@ -1,4 +1,4 @@ -import Tables, NimQml, sequtils, sugar +import NimQml, sequtils import ./io_interface import ./item diff --git a/src/app/modules/main/shared_urls/controller.nim b/src/app/modules/main/shared_urls/controller.nim index af57430263..0cd48aaef7 100644 --- a/src/app/modules/main/shared_urls/controller.nim +++ b/src/app/modules/main/shared_urls/controller.nim @@ -1,4 +1,3 @@ -import stint import ./io_interface import ../../../core/signals/types diff --git a/src/app/modules/main/shared_urls/io_interface.nim b/src/app/modules/main/shared_urls/io_interface.nim index 7263865da8..437d56eb03 100644 --- a/src/app/modules/main/shared_urls/io_interface.nim +++ b/src/app/modules/main/shared_urls/io_interface.nim @@ -1,5 +1,3 @@ -import NimQml, stint - import ../../../../app_service/service/shared_urls/service as urls_service type @@ -29,4 +27,4 @@ method parseSharedUrl*(self: AccessInterface, url: string): UrlDataDto {.base.} # This way (using concepts) is used only for the modules managed by AppController type DelegateInterface* = concept c - c.mainDidLoad() \ No newline at end of file + c.mainDidLoad() diff --git a/src/app/modules/main/shared_urls/module.nim b/src/app/modules/main/shared_urls/module.nim index 8fb9bcb59b..c15a146171 100644 --- a/src/app/modules/main/shared_urls/module.nim +++ b/src/app/modules/main/shared_urls/module.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, stint, json +import NimQml import io_interface, view, controller import ../io_interface as delegate_interface @@ -62,4 +62,4 @@ method parseCommunityChannelSharedUrl*(self: Module, url: string): string = method parseContactSharedUrl*(self: Module, url: string): string = let contactData = self.controller.parseContactSharedUrl(url) - return $contactData \ No newline at end of file + return $contactData diff --git a/src/app/modules/main/stickers/controller.nim b/src/app/modules/main/stickers/controller.nim index 0896b78f94..be1770853b 100644 --- a/src/app/modules/main/stickers/controller.nim +++ b/src/app/modules/main/stickers/controller.nim @@ -3,7 +3,6 @@ import Tables, stint, json import ./io_interface import ../../../core/eventemitter -import ../../../../app_service/service/node/service as node_service import ../../../../app_service/service/stickers/service as stickers_service import ../../../../app_service/service/token/service import ../../../../app_service/service/settings/service as settings_service diff --git a/src/app/modules/main/stickers/io_interface.nim b/src/app/modules/main/stickers/io_interface.nim index a66f69bd1d..8cef814554 100644 --- a/src/app/modules/main/stickers/io_interface.nim +++ b/src/app/modules/main/stickers/io_interface.nim @@ -1,6 +1,5 @@ import Tables, stint import ./item -import ../../../../app_service/service/wallet_account/service as wallet_account_service import ../../../../app_service/service/stickers/service as stickers_service type diff --git a/src/app/modules/main/stickers/module.nim b/src/app/modules/main/stickers/module.nim index 65de8b1226..eaa7ad9ebc 100644 --- a/src/app/modules/main/stickers/module.nim +++ b/src/app/modules/main/stickers/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, stint, sugar, sequtils, json, strutils, strformat, parseutils, chronicles +import NimQml, Tables, stint, sugar, sequtils, json, strutils, strformat, parseutils import ./io_interface, ./view, ./controller, ./item, ./models/sticker_pack_list import ../io_interface as delegate_interface import ../../../global/global_singleton diff --git a/src/app/modules/main/stickers/view.nim b/src/app/modules/main/stickers/view.nim index b18e66e30b..2eeeca0e4d 100644 --- a/src/app/modules/main/stickers/view.nim +++ b/src/app/modules/main/stickers/view.nim @@ -1,8 +1,7 @@ -import NimQml, json, strutils, json_serialization +import NimQml, json, strutils import ./models/[sticker_list, sticker_pack_list] import ./io_interface, ./item -import ../../../../app_service/service/eth/utils as eth_utils QtObject: type diff --git a/src/app/modules/main/wallet_section/accounts/controller.nim b/src/app/modules/main/wallet_section/accounts/controller.nim index 375cb7f44f..534d832237 100644 --- a/src/app/modules/main/wallet_section/accounts/controller.nim +++ b/src/app/modules/main/wallet_section/accounts/controller.nim @@ -1,12 +1,10 @@ -import sugar, sequtils, tables +import sugar, sequtils import io_interface import ../../../../../app_service/service/wallet_account/service as wallet_account_service import ../../../../../app_service/service/network/service as network_service import ../../../../../app_service/service/currency/service as currency_service import ../../../../../app_service/service/currency/dto as currency_dto -import ../../../shared_modules/keycard_popup/io_interface as keycard_shared_module - type Controller* = ref object of RootObj delegate: io_interface.AccessInterface diff --git a/src/app/modules/main/wallet_section/accounts/io_interface.nim b/src/app/modules/main/wallet_section/accounts/io_interface.nim index b3431e8fa7..259bd14856 100644 --- a/src/app/modules/main/wallet_section/accounts/io_interface.nim +++ b/src/app/modules/main/wallet_section/accounts/io_interface.nim @@ -1,5 +1,3 @@ -import ../../../../../app_service/service/wallet_account/service as wallet_account_service - type AccessInterface* {.pure inheritable.} = ref object of RootObj ## Abstract class for any input/interaction with this module. diff --git a/src/app/modules/main/wallet_section/accounts/item.nim b/src/app/modules/main/wallet_section/accounts/item.nim index b85f719e3a..7dca2aea4b 100644 --- a/src/app/modules/main/wallet_section/accounts/item.nim +++ b/src/app/modules/main/wallet_section/accounts/item.nim @@ -1,4 +1,3 @@ -import strformat import ../../../shared_models/wallet_account_item import ../../../shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/accounts/model.nim b/src/app/modules/main/wallet_section/accounts/model.nim index 2bf774e75c..3c05ed5fee 100644 --- a/src/app/modules/main/wallet_section/accounts/model.nim +++ b/src/app/modules/main/wallet_section/accounts/model.nim @@ -1,8 +1,7 @@ -import NimQml, Tables, strutils, strformat, macros +import NimQml, Tables, strutils, strformat import ./item import ../../../shared_models/currency_amount -import ../../../shared_models/token_model type ModelRole {.pure.} = enum diff --git a/src/app/modules/main/wallet_section/accounts/module.nim b/src/app/modules/main/wallet_section/accounts/module.nim index 99ef24133c..b44f3e4669 100644 --- a/src/app/modules/main/wallet_section/accounts/module.nim +++ b/src/app/modules/main/wallet_section/accounts/module.nim @@ -1,16 +1,13 @@ -import tables, NimQml, sequtils, sugar, chronicles +import NimQml, sequtils, sugar -import ./io_interface, ./view, ./item, ./controller +import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface import ../../../../global/global_singleton import ../../../../core/eventemitter -import ../../../../../app_service/common/account_constants -import ../../../../../app_service/service/keycard/service as keycard_service import ../../../../../app_service/service/wallet_account/service as wallet_account_service import ../../../../../app_service/service/network/service as network_service import ../../../../../app_service/service/currency/service as currency_service import ../../../shared/wallet_utils -import ../../../shared_modules/keycard_popup/io_interface as keycard_shared_module export io_interface diff --git a/src/app/modules/main/wallet_section/accounts/view.nim b/src/app/modules/main/wallet_section/accounts/view.nim index 835efe9cf7..bea84b36f6 100644 --- a/src/app/modules/main/wallet_section/accounts/view.nim +++ b/src/app/modules/main/wallet_section/accounts/view.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, strutils, sugar +import NimQml, sequtils, strutils import ../../../../../app_service/service/wallet_account/service as wallet_account_service diff --git a/src/app/modules/main/wallet_section/activity/controller.nim b/src/app/modules/main/wallet_section/activity/controller.nim index 133aa14265..e9d8b56ba0 100644 --- a/src/app/modules/main/wallet_section/activity/controller.nim +++ b/src/app/modules/main/wallet_section/activity/controller.nim @@ -1,4 +1,4 @@ -import NimQml, logging, std/json, sequtils, sugar, options, strutils, locks +import NimQml, logging, std/json, sequtils, sugar, options, strutils import tables, stint, sets import model diff --git a/src/app/modules/main/wallet_section/activity/entry.nim b/src/app/modules/main/wallet_section/activity/entry.nim index ecb298c231..9a85a6308b 100644 --- a/src/app/modules/main/wallet_section/activity/entry.nim +++ b/src/app/modules/main/wallet_section/activity/entry.nim @@ -5,7 +5,6 @@ import app/modules/shared_models/currency_amount import app/global/global_singleton -import app_service/service/currency/dto as currency import app_service/service/currency/service import web3/ethtypes as eth diff --git a/src/app/modules/main/wallet_section/activity/events_handler.nim b/src/app/modules/main/wallet_section/activity/events_handler.nim index cd3e20fca6..4605377403 100644 --- a/src/app/modules/main/wallet_section/activity/events_handler.nim +++ b/src/app/modules/main/wallet_section/activity/events_handler.nim @@ -1,4 +1,4 @@ -import NimQml, logging, std/json, sequtils, strutils, options +import NimQml, std/json, sequtils, strutils, options import tables, stint, sets import entry @@ -132,4 +132,4 @@ QtObject: proc updateSubscribedChainIDs*(self: EventsHandler, chainIDs: seq[int]) = self.subscribedChainIDs.clear() for chainID in chainIDs: - self.subscribedChainIDs.incl(chainID) \ No newline at end of file + self.subscribedChainIDs.incl(chainID) diff --git a/src/app/modules/main/wallet_section/all_tokens/controller.nim b/src/app/modules/main/wallet_section/all_tokens/controller.nim index 8115a9de56..4cd6a95f1c 100644 --- a/src/app/modules/main/wallet_section/all_tokens/controller.nim +++ b/src/app/modules/main/wallet_section/all_tokens/controller.nim @@ -1,5 +1,3 @@ -import tables -import algorithm import ./io_interface import ../../../../core/eventemitter diff --git a/src/app/modules/main/wallet_section/all_tokens/module.nim b/src/app/modules/main/wallet_section/all_tokens/module.nim index 34023d9ada..1933fdadf4 100644 --- a/src/app/modules/main/wallet_section/all_tokens/module.nim +++ b/src/app/modules/main/wallet_section/all_tokens/module.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, sugar +import NimQml import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface diff --git a/src/app/modules/main/wallet_section/all_tokens/view.nim b/src/app/modules/main/wallet_section/all_tokens/view.nim index b884985509..e7c7ab096e 100644 --- a/src/app/modules/main/wallet_section/all_tokens/view.nim +++ b/src/app/modules/main/wallet_section/all_tokens/view.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, sugar, strutils +import NimQml, sequtils, strutils import ./io_interface, ./sources_of_tokens_model, ./flat_tokens_model, ./token_by_symbol_model diff --git a/src/app/modules/main/wallet_section/assets/controller.nim b/src/app/modules/main/wallet_section/assets/controller.nim index 8909089283..88229229e9 100644 --- a/src/app/modules/main/wallet_section/assets/controller.nim +++ b/src/app/modules/main/wallet_section/assets/controller.nim @@ -1,4 +1,4 @@ -import sugar, sequtils, Tables +import sugar, sequtils import io_interface import ../../../../../app_service/service/wallet_account/service as wallet_account_service import ../../../../../app_service/service/network/service as network_service @@ -46,4 +46,4 @@ proc getCurrentCurrency*(self: Controller): string = return self.walletAccountService.getCurrency() proc getCurrencyFormat*(self: Controller, symbol: string): CurrencyFormatDto = - return self.currencyService.getCurrencyFormat(symbol) \ No newline at end of file + return self.currencyService.getCurrencyFormat(symbol) diff --git a/src/app/modules/main/wallet_section/assets/item.nim b/src/app/modules/main/wallet_section/assets/item.nim index 78d07ae638..05e6418f27 100644 --- a/src/app/modules/main/wallet_section/assets/item.nim +++ b/src/app/modules/main/wallet_section/assets/item.nim @@ -1,5 +1,4 @@ import strformat -import ../../../shared_models/currency_amount type Item* = object diff --git a/src/app/modules/main/wallet_section/assets/module.nim b/src/app/modules/main/wallet_section/assets/module.nim index 749df6b13b..043ebffc7e 100644 --- a/src/app/modules/main/wallet_section/assets/module.nim +++ b/src/app/modules/main/wallet_section/assets/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, sequtils, sugar +import NimQml, sequtils, sugar import ../../../../global/global_singleton import ../../../../core/eventemitter @@ -9,10 +9,8 @@ import ../../../../../app_service/service/network/service as network_service import ../../../../../app_service/service/network_connection/service as network_connection import ../../../../../app_service/service/node/service as node_service import ../../../shared/wallet_utils -import ../../../shared_models/currency_amount import ../../../shared_models/token_model as token_model import ../../../shared_models/token_item as token_item -import ./item as account_item import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface @@ -103,4 +101,4 @@ method filterChanged*(self: Module, addresses: seq[string], chainIds: seq[int]) proc onTokensRebuilt(self: Module, hasBalanceCache: bool, hasMarketValuesCache: bool) = self.view.setAssetsLoading(false) - self.view.setCacheValues(hasBalanceCache, hasMarketValuesCache) \ No newline at end of file + self.view.setCacheValues(hasBalanceCache, hasMarketValuesCache) diff --git a/src/app/modules/main/wallet_section/assets/view.nim b/src/app/modules/main/wallet_section/assets/view.nim index c34bfce0ac..706a081d9e 100644 --- a/src/app/modules/main/wallet_section/assets/view.nim +++ b/src/app/modules/main/wallet_section/assets/view.nim @@ -1,8 +1,7 @@ -import NimQml, sequtils, sugar, json +import NimQml, json import ./io_interface import ../../../shared_models/token_model as token_model -import ../../../shared_models/token_item as token_item import ./item as account_item @@ -78,4 +77,4 @@ QtObject: self.hasBalanceCache = hasBalanceCache self.hasBalanceCacheChanged() self.hasMarketValuesCache = hasMarketValuesCache - self.hasMarketValuesCacheChanged() \ No newline at end of file + self.hasMarketValuesCacheChanged() diff --git a/src/app/modules/main/wallet_section/buy_sell_crypto/controller.nim b/src/app/modules/main/wallet_section/buy_sell_crypto/controller.nim index 4c1ce291f0..04c1424524 100644 --- a/src/app/modules/main/wallet_section/buy_sell_crypto/controller.nim +++ b/src/app/modules/main/wallet_section/buy_sell_crypto/controller.nim @@ -1,7 +1,6 @@ import io_interface import ../../../../../app_service/service/transaction/service as transaction_service -import ../../../../../app_service/service/transaction/cryptoRampDto import ../../../../core/eventemitter type diff --git a/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim b/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim index b94f7ac86a..1759349e19 100644 --- a/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim +++ b/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim @@ -1,4 +1,4 @@ -import strformat, chronicles +import strformat type Item* = object name: string diff --git a/src/app/modules/main/wallet_section/buy_sell_crypto/module.nim b/src/app/modules/main/wallet_section/buy_sell_crypto/module.nim index 76bc587958..5d9751774e 100644 --- a/src/app/modules/main/wallet_section/buy_sell_crypto/module.nim +++ b/src/app/modules/main/wallet_section/buy_sell_crypto/module.nim @@ -1,4 +1,4 @@ -import NimQml, sequtils, sugar +import NimQml, sequtils import ./io_interface, ./view, ./item, ./controller import ../io_interface as delegate_interface diff --git a/src/app/modules/main/wallet_section/networks/io_interface.nim b/src/app/modules/main/wallet_section/networks/io_interface.nim index 0f7d620b9f..04d088c172 100644 --- a/src/app/modules/main/wallet_section/networks/io_interface.nim +++ b/src/app/modules/main/wallet_section/networks/io_interface.nim @@ -1,5 +1,3 @@ -import NimQml - type AccessInterface* {.pure inheritable.} = ref object of RootObj ## Abstract class for any input/interaction with this module. @@ -26,4 +24,4 @@ method refreshNetworks*(self: AccessInterface) {.base.} = raise newException(ValueError, "No implementation available") method getNetworkLayer*(self: AccessInterface, chainId: int): string {.base.} = - raise newException(ValueError, "No implementation available") \ No newline at end of file + raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/main/wallet_section/networks/module.nim b/src/app/modules/main/wallet_section/networks/module.nim index c8efe06ddb..1f70bc004d 100644 --- a/src/app/modules/main/wallet_section/networks/module.nim +++ b/src/app/modules/main/wallet_section/networks/module.nim @@ -1,4 +1,4 @@ -import Tables, NimQml +import NimQml import ../io_interface as delegate_interface import io_interface, view, controller import ../../../../global/global_singleton diff --git a/src/app/modules/main/wallet_section/networks/view.nim b/src/app/modules/main/wallet_section/networks/view.nim index 15ba53e5d9..c219d83d9d 100644 --- a/src/app/modules/main/wallet_section/networks/view.nim +++ b/src/app/modules/main/wallet_section/networks/view.nim @@ -1,4 +1,4 @@ -import Tables, NimQml, sequtils, sugar +import NimQml, sequtils, sugar import app_service/service/network/[dto, types] import ./io_interface diff --git a/src/app/modules/main/wallet_section/overview/controller.nim b/src/app/modules/main/wallet_section/overview/controller.nim index 2f663532f2..1a2d28bd44 100644 --- a/src/app/modules/main/wallet_section/overview/controller.nim +++ b/src/app/modules/main/wallet_section/overview/controller.nim @@ -1,4 +1,3 @@ -import sugar, sequtils import io_interface import ../../../../../app_service/service/wallet_account/service as wallet_account_service import ../../../../../app_service/service/currency/service as currency_service @@ -35,4 +34,4 @@ proc getCurrentCurrency*(self: Controller): string = return self.walletAccountService.getCurrency() proc getCurrencyFormat*(self: Controller, symbol: string): CurrencyFormatDto = - return self.currencyService.getCurrencyFormat(symbol) \ No newline at end of file + return self.currencyService.getCurrencyFormat(symbol) diff --git a/src/app/modules/main/wallet_section/overview/module.nim b/src/app/modules/main/wallet_section/overview/module.nim index 235948d237..2d99e093af 100644 --- a/src/app/modules/main/wallet_section/overview/module.nim +++ b/src/app/modules/main/wallet_section/overview/module.nim @@ -1,15 +1,13 @@ -import NimQml, Tables, sequtils, sugar +import NimQml, sequtils, sugar import ../../../../global/global_singleton import ../../../../core/eventemitter import ../../../../../app_service/service/currency/service as currency_service import ../../../../../app_service/service/wallet_account/service as wallet_account_service -import ../../../../../app_service/service/network/service as network_service import ../../../shared/wallet_utils import ../../../shared_models/currency_amount import ./item -import ../filter import ./io_interface, ./view, ./controller import ../io_interface as delegate_interface 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 0501750edf..2862653e41 100644 --- a/src/app/modules/main/wallet_section/send/account_item.nim +++ b/src/app/modules/main/wallet_section/send/account_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml import ../../../shared_models/wallet_account_item import ../../../shared_models/token_model import ../../../shared_models/currency_amount @@ -89,4 +89,4 @@ QtObject: notify = currencyBalanceChanged proc canSend*(self: AccountItem): bool = - return self.canSend \ No newline at end of file + return self.canSend diff --git a/src/app/modules/main/wallet_section/send/gas_fees_item.nim b/src/app/modules/main/wallet_section/send/gas_fees_item.nim index ddbba14702..1370966a94 100644 --- a/src/app/modules/main/wallet_section/send/gas_fees_item.nim +++ b/src/app/modules/main/wallet_section/send/gas_fees_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml QtObject: type GasFeesItem* = ref object of QObject diff --git a/src/app/modules/main/wallet_section/send/module.nim b/src/app/modules/main/wallet_section/send/module.nim index d5ed918e62..e1f1a71a22 100644 --- a/src/app/modules/main/wallet_section/send/module.nim +++ b/src/app/modules/main/wallet_section/send/module.nim @@ -1,4 +1,4 @@ -import tables, NimQml, sequtils, sugar, json, stint, strutils, chronicles +import tables, NimQml, sequtils, sugar, stint, strutils, chronicles import ./io_interface, ./view, ./controller, ./network_item, ./transaction_routes, ./suggested_route_item, ./suggested_route_model, ./gas_estimate_item, ./gas_fees_item, ./network_model import ../io_interface as delegate_interface @@ -8,7 +8,6 @@ import app_service/service/wallet_account/service as wallet_account_service import app_service/service/network/service as network_service import app_service/service/currency/service as currency_service import app_service/service/transaction/service as transaction_service -import app_service/service/network_connection/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 diff --git a/src/app/modules/main/wallet_section/send/suggested_route_item.nim b/src/app/modules/main/wallet_section/send/suggested_route_item.nim index ea11cbe0ab..1a5c5b6233 100644 --- a/src/app/modules/main/wallet_section/send/suggested_route_item.nim +++ b/src/app/modules/main/wallet_section/send/suggested_route_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml import ./gas_fees_item diff --git a/src/app/modules/shared/keypairs.nim b/src/app/modules/shared/keypairs.nim index 1f7a816293..b188ead316 100644 --- a/src/app/modules/shared/keypairs.nim +++ b/src/app/modules/shared/keypairs.nim @@ -1,4 +1,4 @@ -import strutils, sequtils, sugar, chronicles +import chronicles import ../shared_models/[keypair_item, currency_amount] import ../../global/global_singleton diff --git a/src/app/modules/shared_models/collectibles_model.nim b/src/app/modules/shared_models/collectibles_model.nim index 99396567d5..3ce9c8deba 100644 --- a/src/app/modules/shared_models/collectibles_model.nim +++ b/src/app/modules/shared_models/collectibles_model.nim @@ -1,11 +1,9 @@ import NimQml, Tables, strutils, strformat, sequtils, stint, json import logging -import ./collectibles_item, ./collectible_trait_model +import ./collectibles_item import web3/ethtypes as eth import backend/activity as backend_activity -import backend/community_tokens_types -import ../../../app_service/common/utils as common_utils type CollectibleRole* {.pure.} = enum diff --git a/src/app/modules/shared_models/collectibles_nested_item.nim b/src/app/modules/shared_models/collectibles_nested_item.nim index 0f70a35cfb..a89a7186b1 100644 --- a/src/app/modules/shared_models/collectibles_nested_item.nim +++ b/src/app/modules/shared_models/collectibles_nested_item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import strformat type Item* = object diff --git a/src/app/modules/shared_models/collectibles_nested_model.nim b/src/app/modules/shared_models/collectibles_nested_model.nim index 5e7e722b09..34eb5c7cb4 100644 --- a/src/app/modules/shared_models/collectibles_nested_model.nim +++ b/src/app/modules/shared_models/collectibles_nested_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, logging +import NimQml, Tables, strutils, strformat, sequtils import ./collectibles_model as flat_model import ./collectibles_item as flat_item @@ -163,4 +163,4 @@ QtObject: self.beginResetModel() self.items = @[] self.endResetModel() - self.countChanged() \ No newline at end of file + self.countChanged() diff --git a/src/app/modules/shared_models/collectibles_nested_utils.nim b/src/app/modules/shared_models/collectibles_nested_utils.nim index 67584340b1..1e615f9e7d 100644 --- a/src/app/modules/shared_models/collectibles_nested_utils.nim +++ b/src/app/modules/shared_models/collectibles_nested_utils.nim @@ -1,4 +1,3 @@ -import sequtils, sugar, times import collectibles_item as flat_item import collectibles_nested_item as nested_item diff --git a/src/app/modules/shared_models/collectibles_utils.nim b/src/app/modules/shared_models/collectibles_utils.nim index 64aa295d78..73d8fb7ff0 100644 --- a/src/app/modules/shared_models/collectibles_utils.nim +++ b/src/app/modules/shared_models/collectibles_utils.nim @@ -1,4 +1,4 @@ -import sequtils, sugar, times, options +import options import backend/collectibles as backend import collectibles_item import ../../../app_service/service/community_tokens/dto/community_token diff --git a/src/app/modules/shared_models/link_preview_item.nim b/src/app/modules/shared_models/link_preview_item.nim index 1f13c161ed..7e15064992 100644 --- a/src/app/modules/shared_models/link_preview_item.nim +++ b/src/app/modules/shared_models/link_preview_item.nim @@ -1,7 +1,5 @@ import strformat import ../../../app_service/service/message/dto/link_preview -import ../../../app_service/service/message/dto/status_community_link_preview -import ../../../app_service/service/message/dto/status_community_channel_link_preview type Item* = ref object diff --git a/src/app/modules/shared_models/link_preview_model.nim b/src/app/modules/shared_models/link_preview_model.nim index dfc496ae76..ceccf92b0a 100644 --- a/src/app/modules/shared_models/link_preview_model.nim +++ b/src/app/modules/shared_models/link_preview_model.nim @@ -2,7 +2,6 @@ import NimQml, strformat, tables, sequtils, sets import ./link_preview_item import ../../../app_service/service/message/dto/link_preview import ../../../app_service/service/message/dto/standard_link_preview -import ../../../app_service/service/message/dto/status_link_preview import ../../../app_service/service/message/dto/status_contact_link_preview import ../../../app_service/service/message/dto/status_community_link_preview import ../../../app_service/service/message/dto/status_community_channel_link_preview diff --git a/src/app/modules/shared_models/message_item_qobject.nim b/src/app/modules/shared_models/message_item_qobject.nim index 358e0c4a3c..8e2d790044 100644 --- a/src/app/modules/shared_models/message_item_qobject.nim +++ b/src/app/modules/shared_models/message_item_qobject.nim @@ -1,4 +1,4 @@ -import NimQml, std/wrapnils, strutils, strformat, sugar +import NimQml, std/wrapnils, strutils import ./message_item QtObject: @@ -196,4 +196,4 @@ QtObject: proc albumImagesCount*(self: MessageItem): int {.slot.} = result = ?.self.messageItem.albumImagesCount QtProperty[int] albumImagesCount: - read = albumImagesCount \ No newline at end of file + read = albumImagesCount diff --git a/src/app/modules/shared_models/token_item.nim b/src/app/modules/shared_models/token_item.nim index 724754bd30..0a6b42101f 100644 --- a/src/app/modules/shared_models/token_item.nim +++ b/src/app/modules/shared_models/token_item.nim @@ -1,6 +1,5 @@ import strformat -import ../../../app_service/service/wallet_account/dto/account_dto import ./balance_item as balance_item import ./balance_model as balance_model import ./currency_amount diff --git a/src/app/modules/shared_modules/keycard_popup/module.nim b/src/app/modules/shared_modules/keycard_popup/module.nim index c89b8baece..9982005db5 100644 --- a/src/app/modules/shared_modules/keycard_popup/module.nim +++ b/src/app/modules/shared_modules/keycard_popup/module.nim @@ -1,4 +1,4 @@ -import NimQml, tables, random, strutils, sequtils, sugar, chronicles +import NimQml, tables, strutils, sequtils, sugar, chronicles import io_interface import view, controller diff --git a/src/app/modules/shared_modules/keypair_import/io_interface.nim b/src/app/modules/shared_modules/keypair_import/io_interface.nim index 77826f01e5..e5b4a8da20 100644 --- a/src/app/modules/shared_modules/keypair_import/io_interface.nim +++ b/src/app/modules/shared_modules/keypair_import/io_interface.nim @@ -1,4 +1,4 @@ -import Tables, NimQml +import NimQml import app/modules/shared_models/[keypair_item] import app_service/service/wallet_account/dto/derived_address_dto @@ -75,4 +75,4 @@ method validateConnectionString*(self: AccessInterface, connectionString: string type DelegateInterface* = concept c c.onKeypairImportModuleLoaded() - c.destroyKeypairImportPopup() \ No newline at end of file + c.destroyKeypairImportPopup() diff --git a/src/app/modules/startup/module.nim b/src/app/modules/startup/module.nim index 0b895b40b7..e1b1cd00ab 100644 --- a/src/app/modules/startup/module.nim +++ b/src/app/modules/startup/module.nim @@ -570,4 +570,4 @@ method insertMockedKeycardAction*[T](self: Module[T], cardIndex: int) = self.keycardService.insertMockedKeycardAction(cardIndex) method removeMockedKeycardAction*[T](self: Module[T]) = - self.keycardService.removeMockedKeycardAction() \ No newline at end of file + self.keycardService.removeMockedKeycardAction() diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index 47884ea414..f8fbc8cf32 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -1,4 +1,4 @@ -import json, os, strutils +import json import ../../constants as main_constants var NETWORKS* = %* [ diff --git a/src/app_service/service/community/dto/community.nim b/src/app_service/service/community/dto/community.nim index 085c0b23f0..dafd2c2474 100644 --- a/src/app_service/service/community/dto/community.nim +++ b/src/app_service/service/community/dto/community.nim @@ -1,6 +1,5 @@ {.used.} -import std/jsonutils import json, sequtils, sugar, tables, strutils, json_serialization import ../../../../backend/communities diff --git a/src/app_service/service/community/service.nim b/src/app_service/service/community/service.nim index 4cf01cc929..1ca93f5c0a 100644 --- a/src/app_service/service/community/service.nim +++ b/src/app_service/service/community/service.nim @@ -18,7 +18,6 @@ import ../../../backend/communities as status_go import ../../../backend/community_tokens as tokens_backend import ../../../app_service/common/types -import ../../../app_service/common/utils include ./async_tasks diff --git a/src/app_service/service/community_tokens/community_collectible_owner.nim b/src/app_service/service/community_tokens/community_collectible_owner.nim index 4c70523dfe..5217e95ecd 100644 --- a/src/app_service/service/community_tokens/community_collectible_owner.nim +++ b/src/app_service/service/community_tokens/community_collectible_owner.nim @@ -1,4 +1,3 @@ -import json from backend/collectibles_types import CollectibleOwner type diff --git a/src/app_service/service/contacts/service.nim b/src/app_service/service/contacts/service.nim index f7a6d9ed6d..c75c722553 100644 --- a/src/app_service/service/contacts/service.nim +++ b/src/app_service/service/contacts/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, strformat, chronicles, strutils, times, sugar, std/times +import NimQml, Tables, json, sequtils, strformat, chronicles, strutils, times, std/times import ../../../app/global/global_singleton import ../../../app/core/signals/types diff --git a/src/app_service/service/ens/service.nim b/src/app_service/service/ens/service.nim index abd07da1a8..ab2cce8fe1 100644 --- a/src/app_service/service/ens/service.nim +++ b/src/app_service/service/ens/service.nim @@ -1,7 +1,5 @@ import NimQml, Tables, sets, json, sequtils, strutils, chronicles -import web3/conversions -import web3/[conversions, ethtypes], stint -import web3/ethtypes +import web3/ethtypes, stint import ../../../app/core/eventemitter import ../../../app/core/tasks/[qt, threadpool] diff --git a/src/app_service/service/message/async_tasks.nim b/src/app_service/service/message/async_tasks.nim index a80ca9aaca..126b13330e 100644 --- a/src/app_service/service/message/async_tasks.nim +++ b/src/app_service/service/message/async_tasks.nim @@ -1,4 +1,4 @@ -import std/uri, uuids +import uuids include ../../common/json_utils include ../../../app/core/tasks/common diff --git a/src/app_service/service/message/dto/link_preview.nim b/src/app_service/service/message/dto/link_preview.nim index 85ed88056d..747023a6e8 100644 --- a/src/app_service/service/message/dto/link_preview.nim +++ b/src/app_service/service/message/dto/link_preview.nim @@ -1,5 +1,5 @@ import json, strformat, tables -import ./link_preview_thumbnail, ./status_link_preview, ./standard_link_preview +import ./status_link_preview, ./standard_link_preview import ./status_contact_link_preview, ./status_community_link_preview, ./status_community_channel_link_preview import ../../contacts/dto/contact_details import ../../community/dto/community diff --git a/src/app_service/service/message/dto/status_link_preview.nim b/src/app_service/service/message/dto/status_link_preview.nim index 922a29887f..cabe24a8d3 100644 --- a/src/app_service/service/message/dto/status_link_preview.nim +++ b/src/app_service/service/message/dto/status_link_preview.nim @@ -1,5 +1,4 @@ -import json, strformat, NimQml, chronicles -import link_preview_thumbnail +import json, chronicles import status_contact_link_preview import status_community_link_preview import status_community_channel_link_preview diff --git a/src/app_service/service/message/service.nim b/src/app_service/service/message/service.nim index 2ea39f31f5..2c61a38188 100644 --- a/src/app_service/service/message/service.nim +++ b/src/app_service/service/message/service.nim @@ -17,9 +17,8 @@ import ./dto/reaction as reaction_dto import ../chat/dto/chat as chat_dto import ./dto/pinned_message_update as pinned_msg_update_dto import ./dto/removed_message as removed_msg_dto -import ./dto/link_preview -import ./dto/status_link_preview import ./dto/urls_unfurling_plan +import ./dto/link_preview import ./message_cursor import ../../common/message as message_common diff --git a/src/app_service/service/profile/async_tasks.nim b/src/app_service/service/profile/async_tasks.nim index de8f4b117f..75bf51b4ac 100644 --- a/src/app_service/service/profile/async_tasks.nim +++ b/src/app_service/service/profile/async_tasks.nim @@ -1,4 +1,4 @@ -import os, parseutils +import os include ../../common/json_utils include ../../../app/core/tasks/common diff --git a/src/app_service/service/profile/dto/profile_showcase.nim b/src/app_service/service/profile/dto/profile_showcase.nim index 89a9ebf17a..a879caee36 100644 --- a/src/app_service/service/profile/dto/profile_showcase.nim +++ b/src/app_service/service/profile/dto/profile_showcase.nim @@ -1,4 +1,4 @@ -import json, json_serialization, sugar +import json, json_serialization include ../../../common/json_utils diff --git a/src/app_service/service/profile/dto/profile_showcase_preferences.nim b/src/app_service/service/profile/dto/profile_showcase_preferences.nim index 96a7826173..1f72326086 100644 --- a/src/app_service/service/profile/dto/profile_showcase_preferences.nim +++ b/src/app_service/service/profile/dto/profile_showcase_preferences.nim @@ -1,4 +1,4 @@ -import json, strformat, strutils, stint, sequtils, json_serialization +import json, strutils, stint, sequtils, json_serialization include ../../../common/json_utils include ../../../common/utils diff --git a/src/app_service/service/profile/service.nim b/src/app_service/service/profile/service.nim index 10e549cc4d..3cf2c1fdae 100644 --- a/src/app_service/service/profile/service.nim +++ b/src/app_service/service/profile/service.nim @@ -1,4 +1,4 @@ -import NimQml, json, chronicles, tables, sugar +import NimQml, json, chronicles, tables import ../settings/service as settings_service import ../../../app/global/global_singleton diff --git a/src/app_service/service/shared_urls/dto/url_data.nim b/src/app_service/service/shared_urls/dto/url_data.nim index 0b507ee890..00f202ba8e 100644 --- a/src/app_service/service/shared_urls/dto/url_data.nim +++ b/src/app_service/service/shared_urls/dto/url_data.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, strutils +import json, strutils include ../../../common/json_utils diff --git a/src/app_service/service/shared_urls/service.nim b/src/app_service/service/shared_urls/service.nim index 07ea38ab3d..e8b0ee88ab 100644 --- a/src/app_service/service/shared_urls/service.nim +++ b/src/app_service/service/shared_urls/service.nim @@ -1,9 +1,8 @@ -import NimQml, os, json, chronicles +import NimQml, json, chronicles import ../../../backend/general as status_general -import ../../../constants as app_constants import ../../../app/core/eventemitter -import ../../../app/core/tasks/[qt, threadpool] +import ../../../app/core/tasks/threadpool import ./dto/url_data as url_data_dto diff --git a/src/app_service/service/token/service.nim b/src/app_service/service/token/service.nim index 1bcde8400c..abbf3d4d0d 100644 --- a/src/app_service/service/token/service.nim +++ b/src/app_service/service/token/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, chronicles, strutils, strformat, algorithm +import NimQml, Tables, json, sequtils, chronicles, strutils, algorithm import web3/ethtypes from web3/conversions import `$` diff --git a/src/app_service/service/token/service_items.nim b/src/app_service/service/token/service_items.nim index 153c26bfa2..3e284e0414 100644 --- a/src/app_service/service/token/service_items.nim +++ b/src/app_service/service/token/service_items.nim @@ -1,4 +1,4 @@ -import strformat, Tables +import strformat import app_service/common/types as common_types #TODO: remove dependency diff --git a/src/app_service/service/transaction/async_tasks.nim b/src/app_service/service/transaction/async_tasks.nim index 77b97cc8c5..9899770106 100644 --- a/src/app_service/service/transaction/async_tasks.nim +++ b/src/app_service/service/transaction/async_tasks.nim @@ -5,7 +5,6 @@ import stint import ../../../backend/backend as backend import ../../common/conversion as service_conversion -import ../../common/wallet_constants proc sortAsc[T](t1, t2: T): int = if (t1.fromNetwork.chainId > t2.fromNetwork.chainId): return 1 diff --git a/src/app_service/service/transaction/service.nim b/src/app_service/service/transaction/service.nim index 3f59f23c42..17c9589379 100644 --- a/src/app_service/service/transaction/service.nim +++ b/src/app_service/service/transaction/service.nim @@ -23,7 +23,6 @@ import ./dto as transaction_dto import ./cryptoRampDto import ../eth/utils as eth_utils import ../../common/conversion -import ../../../constants as main_constants export transaction_dto diff --git a/src/app_service/service/wallet_account/dto/token_dto.nim b/src/app_service/service/wallet_account/dto/token_dto.nim index b8080fff13..122192fd81 100644 --- a/src/app_service/service/wallet_account/dto/token_dto.nim +++ b/src/app_service/service/wallet_account/dto/token_dto.nim @@ -1,4 +1,4 @@ -import tables, json, strformat, sequtils, sugar, stint, strutils +import tables, json, strformat, stint, strutils import balance_dto diff --git a/src/backend/chat.nim b/src/backend/chat.nim index 3bc8c9da06..48812f88da 100644 --- a/src/backend/chat.nim +++ b/src/backend/chat.nim @@ -5,9 +5,6 @@ import interpret/cropped_image import ../app_service/service/message/dto/link_preview import ../app_service/service/message/dto/standard_link_preview import ../app_service/service/message/dto/status_link_preview -import ../app_service/service/message/dto/status_contact_link_preview -import ../app_service/service/message/dto/status_community_link_preview -import ../app_service/service/message/dto/status_community_channel_link_preview export response_type diff --git a/src/backend/community_tokens.nim b/src/backend/community_tokens.nim index bf44206dc7..5dbec4ee7a 100644 --- a/src/backend/community_tokens.nim +++ b/src/backend/community_tokens.nim @@ -2,7 +2,6 @@ import json, stint import std/sequtils import std/sugar import ./eth -import ../app_service/common/utils import ./core, ./response_type import ../app_service/service/community_tokens/dto/community_token import interpret/cropped_image @@ -142,4 +141,4 @@ proc promoteSelfToControlNode*(communityId: string): RpcResponse[JsonNode] {.rai proc getOwnerTokenOwnerAddress*(chainId: int, contractAddress: string): RpcResponse[JsonNode] {.raises: [Exception].} = let payload = %*[chainId, contractAddress] - return core.callPrivateRPC("communitytokens_ownerTokenOwnerAddress", payload) \ No newline at end of file + return core.callPrivateRPC("communitytokens_ownerTokenOwnerAddress", payload) diff --git a/src/backend/messages.nim b/src/backend/messages.nim index c9d3fa7af8..06934d3d01 100644 --- a/src/backend/messages.nim +++ b/src/backend/messages.nim @@ -1,4 +1,4 @@ -import json, strformat +import json import core, ../app_service/common/utils import response_type diff --git a/src/backend/privacy.nim b/src/backend/privacy.nim index 1da4ddd66a..5de14953e9 100644 --- a/src/backend/privacy.nim +++ b/src/backend/privacy.nim @@ -1,5 +1,4 @@ import json, json_serialization, chronicles -import core, ../app_service/common/utils import response_type import status_go diff --git a/src/backend/transactions.nim b/src/backend/transactions.nim index 6f01cff1c6..1d54b71c6f 100644 --- a/src/backend/transactions.nim +++ b/src/backend/transactions.nim @@ -2,7 +2,6 @@ import Tables, json, stint, json_serialization, strformat import ../app_service/service/eth/dto/transaction import ./core as core -import ../app_service/common/utils type TransactionsSignatures* = Table[string, tuple[r: string, s: string, v: string]]