diff --git a/src/app/chat/event_handling.nim b/src/app/chat/event_handling.nim index 2b0422275e..4a5949a6a6 100644 --- a/src/app/chat/event_handling.nim +++ b/src/app/chat/event_handling.nim @@ -1,8 +1,5 @@ import # std libs - sugar, sequtils, times, strutils - -import - stew/faux_closures + strutils import # status-desktop libs ../../status/chat/chat as status_chat, ./views/communities, diff --git a/src/app/chat/view.nim b/src/app/chat/view.nim index 777b1a30e8..cb6544bf4f 100644 --- a/src/app/chat/view.nim +++ b/src/app/chat/view.nim @@ -1,5 +1,5 @@ -import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os, strformat, algorithm -import ../../status/[status, mailservers] +import NimQml, Tables, json, sequtils, chronicles, strutils, os, strformat +import ../../status/[status] import ../../status/constants import ../../status/utils as status_utils import ../../status/chat as status_chat diff --git a/src/app/chat/views/category_list.nim b/src/app/chat/views/category_list.nim index 04d27d0135..279bedef8a 100644 --- a/src/app/chat/views/category_list.nim +++ b/src/app/chat/views/category_list.nim @@ -1,7 +1,6 @@ import NimQml, Tables -import ../../../status/chat/[chat, message] +import ../../../status/chat/[chat] import ../../../status/status -import ../../../status/ens import ../../../status/accounts import strutils diff --git a/src/app/chat/views/channel.nim b/src/app/chat/views/channel.nim index a22e3f1b82..eb5e34a11b 100644 --- a/src/app/chat/views/channel.nim +++ b/src/app/chat/views/channel.nim @@ -1,11 +1,10 @@ -import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os, strformat, algorithm +import NimQml, Tables, json, sequtils, chronicles, strutils -import ../../../status/[status, contacts, types] -import ../../../status/signals/types as signal_types +import ../../../status/[status, contacts] import ../../../status/ens as status_ens import ../../../status/chat as status_chat -import ../../../status/chat/[chat, message] -import ../../../status/tasks/[qt, task_runner_impl] +import ../../../status/chat/[chat] +import ../../../status/tasks/[task_runner_impl] import communities, chat_item, channels_list, communities, community_list diff --git a/src/app/chat/views/communities.nim b/src/app/chat/views/communities.nim index b868b4c3a5..38c008f0a9 100644 --- a/src/app/chat/views/communities.nim +++ b/src/app/chat/views/communities.nim @@ -4,7 +4,6 @@ import ../../../status/chat/chat import ./community_list import ./community_item import ./community_membership_request_list -import ./channels_list import ../../utils/image_utils import ../../../status/signals/types as signal_types import ../../../status/types diff --git a/src/app/chat/views/format_input.nim b/src/app/chat/views/format_input.nim index 7bd636580e..920859f7e0 100644 --- a/src/app/chat/views/format_input.nim +++ b/src/app/chat/views/format_input.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os, strformat, algorithm +import NimQml, json, sequtils, chronicles, re, strutils logScope: topics = "formatinput-view" diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim index 8bbe3994e2..d38489525d 100644 --- a/src/app/chat/views/message_format.nim +++ b/src/app/chat/views/message_format.nim @@ -1,8 +1,8 @@ -import NimQml, Tables, sets, json, sugar, re +import NimQml, Tables, json, re import ../../../status/status import ../../../status/accounts import ../../../status/chat -import ../../../status/chat/[message,stickers] +import ../../../status/chat/[message] import ../../../status/profile/profile import ../../../status/ens import strformat, strutils, sequtils diff --git a/src/app/chat/views/message_list.nim b/src/app/chat/views/message_list.nim index c27ee10a8c..08e848ce49 100644 --- a/src/app/chat/views/message_list.nim +++ b/src/app/chat/views/message_list.nim @@ -5,7 +5,7 @@ import ../../../status/chat import ../../../status/chat/[message,stickers] import ../../../status/profile/profile import ../../../status/ens -import strformat, strutils +import strutils import message_format type diff --git a/src/app/profile/views/custom_networks.nim b/src/app/profile/views/custom_networks.nim index 91925407b3..61171bfb0c 100644 --- a/src/app/profile/views/custom_networks.nim +++ b/src/app/profile/views/custom_networks.nim @@ -1,6 +1,6 @@ import NimQml import Tables -import json, sequtils, sugar +import json, sequtils import ../../../status/settings import ../../../status/types import ../../../status/status diff --git a/src/app/wallet/views/balance.nim b/src/app/wallet/views/balance.nim index 8089aec7b7..d9d774d3ab 100644 --- a/src/app/wallet/views/balance.nim +++ b/src/app/wallet/views/balance.nim @@ -1,13 +1,12 @@ -import atomics, strformat, strutils, sequtils, json, std/wrapnils, parseUtils, tables, chronicles, web3/[ethtypes, conversions], stint -from sugar import `=>`, `->` +import atomics, strutils, sequtils, json, tables, chronicles, web3/[ethtypes, conversions], stint import NimQml, json, sequtils, chronicles, strutils, strformat, json import - ../../../status/[status, settings, wallet, tokens], + ../../../status/[status, wallet, tokens], ../../../status/tokens as status_tokens, ../../../status/tasks/[qt, task_runner_impl] -import account_list, account_item, transaction_list, accounts, asset_list, token_list, transactions, history +import account_item, accounts, transactions, history logScope: topics = "balance-view" diff --git a/src/app/wallet/views/dapp_browser.nim b/src/app/wallet/views/dapp_browser.nim index e3992528ae..836abdd323 100644 --- a/src/app/wallet/views/dapp_browser.nim +++ b/src/app/wallet/views/dapp_browser.nim @@ -1,9 +1,9 @@ -import atomics, strformat, strutils, sequtils, json, std/wrapnils, parseUtils, tables, chronicles, web3/[ethtypes, conversions], stint -import NimQml, json, sequtils, chronicles, strutils, strformat, json +import sequtils, json, chronicles, web3/[ethtypes, conversions], stint +import NimQml, json, sequtils, chronicles, strutils, json -import ../../../status/[status, settings, wallet, tokens, types] +import ../../../status/[status, settings, wallet, types] -import account_list, account_item, transaction_list, accounts, asset_list, token_list +import account_list, account_item, accounts logScope: topics = "ens-view" diff --git a/src/app/wallet/views/gas.nim b/src/app/wallet/views/gas.nim index c61676921c..71cf3683fa 100644 --- a/src/app/wallet/views/gas.nim +++ b/src/app/wallet/views/gas.nim @@ -1,11 +1,11 @@ -import atomics, strformat, strutils, sequtils, json, std/wrapnils, parseUtils, tables, chronicles, web3/[ethtypes, conversions], stint +import atomics, strformat, strutils, sequtils, json, std/wrapnils, parseUtils, chronicles, web3/[ethtypes, conversions], stint import NimQml, json, sequtils, chronicles, strutils, strformat, json import - ../../../status/[status, settings, wallet, tokens, utils, types], + ../../../status/[status, wallet, utils, types], ../../../status/tasks/[qt, task_runner_impl] -import account_list, account_item, transaction_list, accounts +import account_item const ZERO_ADDRESS* = "0x0000000000000000000000000000000000000000" diff --git a/src/app/wallet/views/history.nim b/src/app/wallet/views/history.nim index 2a6e976ee8..c5b82607a9 100644 --- a/src/app/wallet/views/history.nim +++ b/src/app/wallet/views/history.nim @@ -1,13 +1,13 @@ -import algorithm, atomics, strformat, strutils, sequtils, json, std/wrapnils, parseUtils, tables, chronicles, web3/[ethtypes, conversions], stint, sugar +import algorithm, atomics, strutils, sequtils, json, tables, chronicles, web3/[ethtypes, conversions], stint, sugar from sugar import `=>`, `->` -import NimQml, json, sequtils, chronicles, strutils, strformat, json +import NimQml, json, sequtils, chronicles, strutils, json import - ../../../status/[status, settings, wallet, tokens, types, utils], + ../../../status/[status, wallet, types, utils], ../../../status/wallet as status_wallet, ../../../status/tasks/[qt, task_runner_impl] -import account_list, account_item, transaction_list, accounts, asset_list, token_list, transactions +import account_list, account_item, transaction_list, accounts, transactions logScope: topics = "history-view" diff --git a/src/status/browser.nim b/src/status/browser.nim index 1af4fcfef0..ece17c9d5f 100644 --- a/src/status/browser.nim +++ b/src/status/browser.nim @@ -1,11 +1,7 @@ -import json, json_serialization - -import - sugar, sequtils, strutils, atomics +import json import libstatus/browser as status_browser import ../eventemitter -import signals/types #TODO: temporary? import types as LibStatusTypes diff --git a/src/status/chat.nim b/src/status/chat.nim index c7e902a430..0726876f7d 100644 --- a/src/status/chat.nim +++ b/src/status/chat.nim @@ -1,10 +1,8 @@ import json, strutils, sequtils, tables, chronicles, times, sugar import libstatus/chat as status_chat -import libstatus/mailservers as status_mailservers import libstatus/chatCommands as status_chat_commands import types import utils as status_utils -import libstatus/contacts as status_contacts import stickers import ../eventemitter diff --git a/src/status/libstatus/contacts.nim b/src/status/libstatus/contacts.nim index 7d9c5680e2..51fe2e62a0 100644 --- a/src/status/libstatus/contacts.nim +++ b/src/status/libstatus/contacts.nim @@ -1,5 +1,5 @@ import json, strmisc, atomics -import core, ../utils, ../types, settings +import core, ../utils, ../types from ../profile/profile import Profile var diff --git a/src/status/libstatus/mailservers.nim b/src/status/libstatus/mailservers.nim index 986b15e9f8..f6a1034c78 100644 --- a/src/status/libstatus/mailservers.nim +++ b/src/status/libstatus/mailservers.nim @@ -1,4 +1,4 @@ -import json, times +import json import core, ../utils proc ping*(mailservers: seq[string], timeoutMs: int): string = diff --git a/src/status/mailservers.nim b/src/status/mailservers.nim index 44479a486e..aa31944468 100644 --- a/src/status/mailservers.nim +++ b/src/status/mailservers.nim @@ -1,11 +1,7 @@ -import json, json_serialization - -import - sugar, sequtils, strutils, atomics +import json import libstatus/mailservers as status_mailservers import ../eventemitter -import signals/types #TODO: temporary? import types as LibStatusTypes diff --git a/src/status/provider.nim b/src/status/provider.nim index 8eaf072d61..463d1db9e4 100644 --- a/src/status/provider.nim +++ b/src/status/provider.nim @@ -1,4 +1,4 @@ -import ens, chat/stickers, wallet, settings, permissions +import ens, wallet, permissions import ../eventemitter import types import libstatus/accounts diff --git a/src/status/signals/messages.nim b/src/status/signals/messages.nim index 4f60039755..e82c434a4a 100644 --- a/src/status/signals/messages.nim +++ b/src/status/signals/messages.nim @@ -1,4 +1,4 @@ -import json, random, strutils, sequtils, sugar, chronicles, tables +import json, random, strutils, sequtils, sugar, chronicles import json_serialization import ../utils import ../libstatus/accounts as status_accounts diff --git a/src/status/tasks/marathon/mailserver/model.nim b/src/status/tasks/marathon/mailserver/model.nim index 57a2265c3e..f11ef8f3e3 100644 --- a/src/status/tasks/marathon/mailserver/model.nim +++ b/src/status/tasks/marathon/mailserver/model.nim @@ -1,12 +1,12 @@ import - algorithm, chronos, chronicles, json, math, os, random, sequtils, sets, sugar, + algorithm, chronos, chronicles, json, math, os, random, sequtils, sets, tables from times import cpuTime import ../../../libstatus/settings as status_settings, ../../../libstatus/mailservers as status_mailservers, - ../../../libstatus/core as status_core, ../../../libstatus/chat as status_chat, + ../../../libstatus/core as status_core, ../../../types, ../../../fleet, ./events as mailserver_events