From 0846d7b18e490d7d85363f259efc1605565de1c2 Mon Sep 17 00:00:00 2001 From: ant013 Date: Tue, 17 Oct 2023 09:27:17 +0600 Subject: [PATCH] Include CurrencyKit library code into App --- .../project.pbxproj | 49 ++++++-------- .../Currencies/AUD.imageset/Australia@2x.png | Bin 0 -> 2317 bytes .../Currencies/AUD.imageset/Australia@3x.png | Bin 0 -> 3570 bytes .../Currencies/AUD.imageset/Contents.json | 22 +++++++ .../Currencies/BNB.imageset/BNB@2x.png | Bin 0 -> 1292 bytes .../Currencies/BNB.imageset/BNB@3x.png | Bin 0 -> 1938 bytes .../Currencies/BNB.imageset/Contents.json | 22 +++++++ .../Currencies/BRL.imageset/Brasil@2x.png | Bin 0 -> 1806 bytes .../Currencies/BRL.imageset/Brasil@3x.png | Bin 0 -> 2522 bytes .../Currencies/BRL.imageset/Contents.json | 22 +++++++ .../Currencies/BTC.imageset/Contents.json | 22 +++++++ .../Currencies/BTC.imageset/btc@2x.png | Bin 0 -> 1856 bytes .../Currencies/BTC.imageset/btc@3x.png | Bin 0 -> 2694 bytes .../Currencies/CAD.imageset/Canada@2x.png | Bin 0 -> 1166 bytes .../Currencies/CAD.imageset/Canada@3x.png | Bin 0 -> 1691 bytes .../Currencies/CAD.imageset/Contents.json | 22 +++++++ .../Currencies/CHF.imageset/Contents.json | 22 +++++++ .../CHF.imageset/Switzerland@2x.png | Bin 0 -> 758 bytes .../CHF.imageset/Switzerland@3x.png | Bin 0 -> 1171 bytes .../Currencies/CNY.imageset/China@2x.png | Bin 0 -> 1165 bytes .../Currencies/CNY.imageset/China@3x.png | Bin 0 -> 1820 bytes .../Currencies/CNY.imageset/Contents.json | 22 +++++++ .../Assets.xcassets/Currencies/Contents.json | 6 ++ .../Currencies/ETH.imageset/Contents.json | 22 +++++++ .../Currencies/ETH.imageset/eth@2x.png | Bin 0 -> 2948 bytes .../Currencies/ETH.imageset/eth@3x.png | Bin 0 -> 5419 bytes .../Currencies/EUR.imageset/Contents.json | 22 +++++++ .../Currencies/EUR.imageset/europe@2x.png | Bin 0 -> 1603 bytes .../Currencies/EUR.imageset/europe@3x.png | Bin 0 -> 2487 bytes .../Currencies/GBP.imageset/Contents.json | 22 +++++++ .../Currencies/GBP.imageset/england@2x.png | Bin 0 -> 2412 bytes .../Currencies/GBP.imageset/england@3x.png | Bin 0 -> 3168 bytes .../Currencies/HKD.imageset/Contents.json | 22 +++++++ .../Currencies/HKD.imageset/HongKong@2x.png | Bin 0 -> 1868 bytes .../Currencies/HKD.imageset/HongKong@3x.png | Bin 0 -> 2767 bytes .../Currencies/ILS.imageset/Contents.json | 22 +++++++ .../Currencies/ILS.imageset/Israel@2x.png | Bin 0 -> 1313 bytes .../Currencies/ILS.imageset/Israel@3x.png | Bin 0 -> 1836 bytes .../Currencies/INR.imageset/Contents.json | 22 +++++++ .../Currencies/INR.imageset/India@2x.png | Bin 0 -> 1284 bytes .../Currencies/INR.imageset/India@3x.png | Bin 0 -> 2166 bytes .../Currencies/JPY.imageset/Contents.json | 22 +++++++ .../Currencies/JPY.imageset/japan@2x.png | Bin 0 -> 953 bytes .../Currencies/JPY.imageset/japan@3x.png | Bin 0 -> 1463 bytes .../Currencies/RUB.imageset/Contents.json | 22 +++++++ .../Currencies/RUB.imageset/Russia@2x.png | Bin 0 -> 683 bytes .../Currencies/RUB.imageset/Russia@3x.png | Bin 0 -> 1001 bytes .../Currencies/SGD.imageset/Contents.json | 22 +++++++ .../Currencies/SGD.imageset/Singapore@2x.png | Bin 0 -> 1269 bytes .../Currencies/SGD.imageset/Singapore@3x.png | Bin 0 -> 1880 bytes .../Currencies/USD.imageset/Contents.json | 22 +++++++ .../Currencies/USD.imageset/usa@2x.png | Bin 0 -> 1891 bytes .../Currencies/USD.imageset/usa@3x.png | Bin 0 -> 3032 bytes .../Currencies/ZAR.imageset/Contents.json | 22 +++++++ .../ZAR.imageset/South Africa@2x.png | Bin 0 -> 1462 bytes .../ZAR.imageset/South Africa@3x.png | Bin 0 -> 1974 bytes .../UnstoppableWallet/Core/App.swift | 7 +- .../Core/Crypto/SettingsBackup.swift | 1 - .../Core/Ethereum/CoinService.swift | 9 ++- .../Core/Ethereum/EvmCoinServiceFactory.swift | 11 ++-- .../Core/Fiat/FiatService.swift | 9 ++- .../Core/Managers/CurrencyManager.swift | 61 ++++++++++++++++++ .../Extensions/CurrencyValue.swift | 9 --- .../UnstoppableWallet/Models/AmountData.swift | 1 - .../UnstoppableWallet/Models/Currency.swift | 11 ++++ .../Models/CurrencyValue.swift | 23 +++++++ .../Backup/ICloud/AppBackupProvider.swift | 13 ++-- .../CexWithdraw/CexAmountInputViewModel.swift | 1 - .../Cex/CexWithdraw/CexCoinService.swift | 9 ++- .../Cex/CexWithdraw/CexWithdrawModule.swift | 4 +- .../CexWithdraw/CexWithdrawViewModel.swift | 1 - .../CexWithdrawConfirmModule.swift | 2 +- .../Coin/Analytics/CoinAnalyticsModule.swift | 4 +- .../Coin/Analytics/CoinAnalyticsService.swift | 9 ++- .../TechnicalIndicatorService.swift | 9 ++- .../Modules/Coin/CoinChart/ChartModule.swift | 1 - .../Coin/CoinChart/CoinChartService.swift | 9 ++- .../Coin/CoinChart/CoinChartViewModel.swift | 1 - .../Modules/Coin/CoinChartFactory.swift | 1 - .../CoinInvestors/CoinInvestorsModule.swift | 2 +- .../CoinInvestors/CoinInvestorsService.swift | 9 ++- .../Coin/CoinMarkets/CoinMarketsModule.swift | 2 +- .../Coin/CoinMarkets/CoinMarketsService.swift | 9 ++- .../CoinOverview/CoinOverviewModule.swift | 8 +-- .../CoinOverview/CoinOverviewService.swift | 13 ++-- .../Coin/CoinOverview/CoinOverviewView.swift | 1 - .../CoinOverviewViewItemFactory.swift | 1 - .../CoinOverviewViewModelNew.swift | 13 ++-- .../Modules/Coin/Ranks/CoinRankModule.swift | 2 +- .../Modules/Coin/Ranks/CoinRankService.swift | 13 ++-- .../Coin/Ranks/CoinRankViewModel.swift | 1 - .../Treasuries/CoinTreasuriesModule.swift | 2 +- .../Treasuries/CoinTreasuriesService.swift | 13 ++-- .../Modules/CoinSelect/CoinSelectModule.swift | 2 +- .../CoinSelect/CoinSelectService.swift | 11 ++-- .../CoinSelect/CoinSelectViewModel.swift | 1 - .../MarketFilteredListService.swift | 9 ++- .../MarketAdvancedSearchModule.swift | 2 +- .../MarketAdvancedSearchService.swift | 13 ++-- .../MarketAdvancedSearchViewModel.swift | 1 - .../MarketAdvancedSearchResultModule.swift | 2 +- .../MarketAdvancedSearchResultService.swift | 9 ++- .../MarketCategoryMarketCapFetcher.swift | 11 ++-- .../MarketCategory/MarketCategoryModule.swift | 4 +- .../MarketDiscoveryCategoryService.swift | 13 ++-- .../MarketDiscoveryFilterService.swift | 1 - .../MarketDiscoveryModule.swift | 3 +- .../MarketDiscoveryViewModel.swift | 1 - .../MarketGlobal/MarketGlobalFetcher.swift | 11 ++-- .../MarketGlobalDefiMetricService.swift | 9 ++- .../DefiCap/MarketListDefiDecorator.swift | 1 - .../MarketGlobalMetricModule.swift | 12 ++-- .../MarketGlobalMetricService.swift | 9 ++- .../TvlInDefi/MarketGlobalTvlFetcher.swift | 11 ++-- .../MarketGlobalTvlMetricService.swift | 9 ++- .../TvlInDefi/MarketListTvlDecorator.swift | 1 - .../MarketListMarketFieldDecorator.swift | 1 - .../MarketList/MarketListViewModel.swift | 1 - .../MarketList/MarketListWatchViewModel.swift | 1 - .../Modules/Market/MarketModule.swift | 1 - .../MarketNftTopCollectionsModule.swift | 2 +- .../MarketNftTopCollectionsService.swift | 7 +- .../MarketOverviewCategoryService.swift | 1 - .../MarketOverviewGlobalService.swift | 1 - .../MarketOverviewGlobalViewModel.swift | 1 - .../MarketOverview/MarketOverviewModule.swift | 2 +- .../MarketOverviewService.swift | 11 ++-- .../MarketOverviewTopCoinsService.swift | 1 - .../MarketOverviewTopCoinsViewModel.swift | 1 - .../MarketOverviewNftCollectionsService.swift | 1 - .../MarketOverviewTopPlatformsService.swift | 1 - .../Market/MarketTop/MarketTopModule.swift | 2 +- .../Market/MarketTop/MarketTopService.swift | 9 ++- .../MarketListTopPlatformDecorator.swift | 1 - .../MarketTopPlatformsModule.swift | 2 +- .../MarketTopPlatformsService.swift | 11 ++-- .../MarketWatchlistModule.swift | 2 +- .../MarketWatchlistService.swift | 11 ++-- .../TopPlatformMarketCapFetcher.swift | 11 ++-- .../TopPlatform/TopPlatformModule.swift | 4 +- .../MetricChart/MetricChartFactory.swift | 1 - .../MetricChart/MetricChartModule.swift | 1 - .../MetricChart/MetricChartService.swift | 1 - .../MetricChart/MetricChartViewModel.swift | 1 - .../Modules/Nft/NftModule.swift | 2 +- .../Modules/Nft/NftService.swift | 1 - .../Modules/Nft/NftViewModel.swift | 1 - .../Overview/NftAssetOverviewModule.swift | 2 +- .../Overview/NftAssetOverviewService.swift | 1 - .../Overview/NftAssetOverviewViewModel.swift | 1 - .../Activity/NftActivityModule.swift | 2 +- .../Activity/NftActivityViewModel.swift | 1 - .../Assets/NftCollectionAssetsModule.swift | 2 +- .../Assets/NftCollectionAssetsViewModel.swift | 1 - .../NftCollectionOverviewModule.swift | 2 +- .../NftCollectionOverviewViewModel.swift | 1 - .../ProCharts/CoinProChartModule.swift | 2 +- .../ProCharts/ProChartFetcher.swift | 17 +++-- .../SendAmountCautionViewModel.swift | 1 - .../Confirmation/SendConfirmationModule.swift | 1 - ...endFeeSettingsAmountCautionViewModel.swift | 1 - .../Bitcoin/SendBitcoinFactory.swift | 1 - .../Modules/Send/Platforms/SendModule.swift | 18 +++--- .../SendEvm/AmountInputViewModel.swift | 1 - .../SendEvmConfirmationModule.swift | 4 +- .../SendAvailableBalanceViewModel.swift | 1 - .../Modules/SendEvm/SendEvmModule.swift | 4 +- .../IntegerAmountInputViewModel.swift | 1 - ...SendEip1155AvailableBalanceViewModel.swift | 1 - .../SendTronConfirmationModule.swift | 4 +- .../Modules/SendTron/SendTronModule.swift | 4 +- .../BaseCurrencySettingsModule.swift | 2 +- .../BaseCurrencySettingsService.swift | 15 ++--- .../BaseCurrencySettingsViewModel.swift | 3 +- .../Settings/Main/MainSettingsModule.swift | 2 +- .../Settings/Main/MainSettingsService.swift | 11 ++-- .../Swap/Adapters/OneInch/OneInchModule.swift | 2 +- .../Adapters/OneInch/OneInchService.swift | 1 - .../Adapters/OneInch/OneInchViewModel.swift | 9 ++- .../Swap/Adapters/Uniswap/UniswapModule.swift | 2 +- .../Adapters/Uniswap/UniswapService.swift | 1 - .../Adapters/Uniswap/UniswapViewModel.swift | 9 ++- .../Adapters/UniswapV3/UniswapV3Module.swift | 2 +- .../Adapters/UniswapV3/UniswapV3Service.swift | 1 - .../UniswapV3/UniswapV3ViewModel.swift | 9 ++- .../Swap/CoinCard/CoinCardModule.swift | 8 +-- .../Swap/CoinCard/SwapCoinCardViewModel.swift | 1 - .../SwapApproveConfirmationModule.swift | 2 +- .../SwapApprove/SwapApproveModule.swift | 2 +- .../SwapConfirmationModule.swift | 4 +- .../SwapNew/InputCard/SwapInputModule.swift | 12 ++-- .../TransactionInfoModule.swift | 5 +- .../TransactionInfoService.swift | 7 +- .../TransactionInfoViewController.swift | 1 - .../TransactionInfoViewItemFactory.swift | 1 - .../TransactionInfoViewModel.swift | 1 - .../BaseTransactionsService.swift | 1 - .../TransactionsCoinSelectViewModel.swift | 1 - .../Transactions/HistoricalRateService.swift | 7 +- .../Transactions/TransactionsModule.swift | 5 +- .../TransactionsViewController.swift | 1 - .../TransactionsViewItemFactory.swift | 1 - .../WalletTokenBalanceModule.swift | 2 +- .../WalletTokenBalanceService.swift | 1 - .../WalletTokenBalanceViewItemFactory.swift | 1 - .../TokenList/WalletTokenListService.swift | 1 - .../WalletTokenListViewItemFactory.swift | 1 - .../Wallet/WalletCoinPriceService.swift | 19 +++--- .../Modules/Wallet/WalletModule.swift | 9 ++- .../Modules/Wallet/WalletService.swift | 1 - .../Wallet/WalletViewItemFactory.swift | 1 - ...SendEthereumTransactionRequestModule.swift | 2 +- .../Request/WalletConnectRequestModule.swift | 1 - .../Extensions/ChartConfiguration.swift | 1 - .../UserInterface/ValueFormatter.swift | 1 - 215 files changed, 796 insertions(+), 434 deletions(-) create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BNB.imageset/BNB@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BNB.imageset/BNB@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BNB.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Brasil@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Brasil@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/btc@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/btc@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CHF.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CHF.imageset/Switzerland@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CHF.imageset/Switzerland@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/China@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/China@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/eth@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/eth@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/EUR.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/EUR.imageset/europe@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/EUR.imageset/europe@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/england@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/england@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/HKD.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/HKD.imageset/HongKong@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/HKD.imageset/HongKong@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Israel@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Israel@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/India@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/India@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/JPY.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/JPY.imageset/japan@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/JPY.imageset/japan@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Russia@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Russia@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Singapore@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Singapore@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/usa@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/usa@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/Contents.json create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/South Africa@2x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/South Africa@3x.png create mode 100644 UnstoppableWallet/UnstoppableWallet/Core/Managers/CurrencyManager.swift delete mode 100644 UnstoppableWallet/UnstoppableWallet/Extensions/CurrencyValue.swift create mode 100644 UnstoppableWallet/UnstoppableWallet/Models/Currency.swift create mode 100644 UnstoppableWallet/UnstoppableWallet/Models/CurrencyValue.swift diff --git a/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj b/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj index 11a123cdfd..bd61526370 100644 --- a/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj +++ b/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj @@ -1551,7 +1551,6 @@ 2FA5D0588EFCA934B4CAC162 /* ContractCreationTransactionRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DD13ED115F4177BE09AB /* ContractCreationTransactionRecord.swift */; }; 2FA5D06916F84E180B2AF357 /* InputOutputOrderService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DE5E6FEC377D020FF2D7 /* InputOutputOrderService.swift */; }; 2FA5D069D16C6119C970EDF1 /* StepperAmountInputCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5D79CD6D86572DC629A57 /* StepperAmountInputCell.swift */; }; - 2FA5D07E79859294E1C86C9A /* CurrencyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5D1C0A43841C61C61E3AF /* CurrencyValue.swift */; }; 2FA5D095A83D18DE2E21B580 /* EvmTransactionsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DD0A8C1E757651F3CA3B /* EvmTransactionsAdapter.swift */; }; 2FA5D0A03A0F625BCF184F4B /* TweetPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DCFA4D46BD41B6EB020B /* TweetPollView.swift */; }; 2FA5D0C39052BB3698B95876 /* LogRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5D73DA43455B86DF104FE /* LogRecord.swift */; }; @@ -1600,7 +1599,6 @@ 2FA5D6224C65D97B910F3A20 /* TweetPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DCFA4D46BD41B6EB020B /* TweetPollView.swift */; }; 2FA5D62A6A421EEDFE784615 /* TimeLockViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DBB240F86CFACCF60CDA /* TimeLockViewModel.swift */; }; 2FA5D62FF4A9D8F54848D2C0 /* NonceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DCB378763D65D51DBE19 /* NonceViewModel.swift */; }; - 2FA5D66EE76C7CAE38843694 /* CurrencyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5D1C0A43841C61C61E3AF /* CurrencyValue.swift */; }; 2FA5D68102F8CD6FB793A158 /* EvmSendSettingsModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DA2EFE1B3415CDC9FDED /* EvmSendSettingsModule.swift */; }; 2FA5D6AE95126ABEA34CE867 /* LogRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5D73DA43455B86DF104FE /* LogRecord.swift */; }; 2FA5D6BCACDEB0BF06310354 /* TransactionAdapterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA5DFE7C4A198C235B2EAB5 /* TransactionAdapterManager.swift */; }; @@ -1987,6 +1985,12 @@ 6BDA29AB29D6F37C003847ED /* ECashKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6BDA29AA29D6F37C003847ED /* ECashKit */; }; 6BDA29AD29D6F384003847ED /* ECashKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6BDA29AC29D6F384003847ED /* ECashKit */; }; 6BDA29B029D6F934003847ED /* HsToolKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6BDA29AF29D6F934003847ED /* HsToolKit */; }; + 6BE8A07B2ADE2F8D0012DE7F /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A07A2ADE2F8D0012DE7F /* Currency.swift */; }; + 6BE8A07C2ADE2F8D0012DE7F /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A07A2ADE2F8D0012DE7F /* Currency.swift */; }; + 6BE8A07E2ADE2F950012DE7F /* CurrencyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A07D2ADE2F950012DE7F /* CurrencyValue.swift */; }; + 6BE8A07F2ADE2F950012DE7F /* CurrencyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A07D2ADE2F950012DE7F /* CurrencyValue.swift */; }; + 6BE8A0812ADE2FAB0012DE7F /* CurrencyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A0802ADE2FAB0012DE7F /* CurrencyManager.swift */; }; + 6BE8A0822ADE2FAB0012DE7F /* CurrencyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE8A0802ADE2FAB0012DE7F /* CurrencyManager.swift */; }; ABC9A001F335B695CD066218 /* NftAssetModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC9AD35D41AEEBD38AA08B5 /* NftAssetModule.swift */; }; ABC9A005F31836B4EBAB1C97 /* DonateDescriptionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC9AD0848221B0EC25C37F3 /* DonateDescriptionCell.swift */; }; ABC9A0073333D3DEC2797D15 /* BackupCloudPassphraseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC9A8E4CDD143171A1F9C46 /* BackupCloudPassphraseViewController.swift */; }; @@ -2603,7 +2607,6 @@ D3604E7028F03AC80066C366 /* MarketKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E6F28F03AC80066C366 /* MarketKit */; }; D3604E7328F03B0A0066C366 /* ScanQrKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E7228F03B0A0066C366 /* ScanQrKit */; }; D3604E7928F03B9F0066C366 /* ModuleKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E7828F03B9F0066C366 /* ModuleKit */; }; - D3604E7C28F03BD20066C366 /* CurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E7B28F03BD20066C366 /* CurrencyKit */; }; D3604E7F28F03C1D0066C366 /* Chart in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E7E28F03C1D0066C366 /* Chart */; }; D3604E8228F03C6B0066C366 /* FeeRateKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E8128F03C6B0066C366 /* FeeRateKit */; }; D3604E8528F03CDC0066C366 /* BinanceChainKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E8428F03CDC0066C366 /* BinanceChainKit */; }; @@ -2614,7 +2617,6 @@ D3604E9028F03DC00066C366 /* MarketKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E8F28F03DC00066C366 /* MarketKit */; }; D3604E9228F03DC00066C366 /* ScanQrKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9128F03DC00066C366 /* ScanQrKit */; }; D3604E9628F03DC00066C366 /* ModuleKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9528F03DC00066C366 /* ModuleKit */; }; - D3604E9828F03DC00066C366 /* CurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9728F03DC00066C366 /* CurrencyKit */; }; D3604E9A28F03DC00066C366 /* Chart in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9928F03DC00066C366 /* Chart */; }; D3604E9C28F03DC00066C366 /* FeeRateKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9B28F03DC00066C366 /* FeeRateKit */; }; D3604E9E28F03DC00066C366 /* BinanceChainKit in Frameworks */ = {isa = PBXBuildFile; productRef = D3604E9D28F03DC00066C366 /* BinanceChainKit */; }; @@ -3577,7 +3579,6 @@ 2FA5D02D8F5C2AE32C6FF923 /* KitCleaner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KitCleaner.swift; sourceTree = ""; }; 2FA5D0F4DBA8FC1F917AA95B /* SendSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendSettingsViewController.swift; sourceTree = ""; }; 2FA5D18B213209DFBB374FE1 /* TimeLockDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeLockDataSource.swift; sourceTree = ""; }; - 2FA5D1C0A43841C61C61E3AF /* CurrencyValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyValue.swift; sourceTree = ""; }; 2FA5D299198FEF01FB5D06DE /* TransactionInfoViewItemFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionInfoViewItemFactory.swift; sourceTree = ""; }; 2FA5D2B93C053ABB9445C148 /* BitcoinTransactionRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitcoinTransactionRecord.swift; sourceTree = ""; }; 2FA5D2FB94B5545387375AA3 /* TransactionInfoService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionInfoService.swift; sourceTree = ""; }; @@ -3802,6 +3803,9 @@ 6BCD53112A161F4800993F20 /* BackupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackupViewController.swift; sourceTree = ""; }; 6BCD53182A161F9100993F20 /* BackupService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackupService.swift; sourceTree = ""; }; 6BCD531B2A16203F00993F20 /* CloudBackupManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CloudBackupManager.swift; sourceTree = ""; }; + 6BE8A07A2ADE2F8D0012DE7F /* Currency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Currency.swift; sourceTree = ""; }; + 6BE8A07D2ADE2F950012DE7F /* CurrencyValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyValue.swift; sourceTree = ""; }; + 6BE8A0802ADE2FAB0012DE7F /* CurrencyManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyManager.swift; sourceTree = ""; }; ABC9A021D71EDD24DFB6BA62 /* CoinProChartModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoinProChartModule.swift; sourceTree = ""; }; ABC9A03401172C4C65D66764 /* SingleLineFormTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleLineFormTextView.swift; sourceTree = ""; }; ABC9A044BFF4E76CD17835CA /* IndicatorAdviceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndicatorAdviceView.swift; sourceTree = ""; }; @@ -4184,7 +4188,6 @@ D3604E9228F03DC00066C366 /* ScanQrKit in Frameworks */, D3BF1E65274CBBE400229A00 /* DeepDiff in Frameworks */, D3993DA728F422BD008720FB /* ZcashLightClientKit in Frameworks */, - D3604E9828F03DC00066C366 /* CurrencyKit in Frameworks */, D0DA7411272A6F180072BE86 /* IDNSDK in Frameworks */, D3C187E4290FD00E00FE1900 /* HUD in Frameworks */, D3604E9C28F03DC00066C366 /* FeeRateKit in Frameworks */, @@ -4238,7 +4241,6 @@ D3BF1E63274CBBCE00229A00 /* DeepDiff in Frameworks */, D3993DA528F4229F008720FB /* ZcashLightClientKit in Frameworks */, D023D2632A249E59004F65B0 /* TronKit in Frameworks */, - D3604E7C28F03BD20066C366 /* CurrencyKit in Frameworks */, D0DA740D272A6EFC0072BE86 /* IDNSDK in Frameworks */, D3C187D5290FCF7D00FE1900 /* HUD in Frameworks */, D3604E8228F03C6B0066C366 /* FeeRateKit in Frameworks */, @@ -4588,7 +4590,6 @@ 11B35264F7CE80AD5D9A540A /* CoinInvestment.swift */, 11B35185ECC372A193D00A00 /* CoinTreasury.swift */, 11B35D8AF9D337A98530548D /* Auditor.swift */, - 2FA5D1C0A43841C61C61E3AF /* CurrencyValue.swift */, ABC9A8CE84FA36438BE4D6B5 /* FileManager.swift */, 11B3593FBD158050C9FEF6B9 /* Misc.swift */, ABC9A9B35C58F6525F3B2D5C /* FullCoin.swift */, @@ -4748,6 +4749,7 @@ 11B35480153660045A6CF9AC /* Managers */ = { isa = PBXGroup; children = ( + 6BE8A0802ADE2FAB0012DE7F /* CurrencyManager.swift */, 1A564BB88BF3ED779F8C21DC /* BlurManager.swift */, 11B35C4FFB99D10A8F343E9C /* LanguageManager.swift */, 11B357BA1A6AC79F07B54FB5 /* SystemInfoManager.swift */, @@ -5086,6 +5088,8 @@ 11B356605394189E9B5EBEE0 /* Models */ = { isa = PBXGroup; children = ( + 6BE8A07D2ADE2F950012DE7F /* CurrencyValue.swift */, + 6BE8A07A2ADE2F8D0012DE7F /* Currency.swift */, 11B3526E3BCED7FF55C3CAD2 /* Deprecated */, D008CA58267C8DB300001E0A /* TransactionRecords */, D31C475A238BF175008CB818 /* FeeRateState.swift */, @@ -7957,7 +7961,6 @@ D3604E8F28F03DC00066C366 /* MarketKit */, D3604E9128F03DC00066C366 /* ScanQrKit */, D3604E9528F03DC00066C366 /* ModuleKit */, - D3604E9728F03DC00066C366 /* CurrencyKit */, D3604E9928F03DC00066C366 /* Chart */, D3604E9B28F03DC00066C366 /* FeeRateKit */, D3604E9D28F03DC00066C366 /* BinanceChainKit */, @@ -8020,7 +8023,6 @@ D3604E6F28F03AC80066C366 /* MarketKit */, D3604E7228F03B0A0066C366 /* ScanQrKit */, D3604E7828F03B9F0066C366 /* ModuleKit */, - D3604E7B28F03BD20066C366 /* CurrencyKit */, D3604E7E28F03C1D0066C366 /* Chart */, D3604E8128F03C6B0066C366 /* FeeRateKit */, D3604E8428F03CDC0066C366 /* BinanceChainKit */, @@ -8108,7 +8110,6 @@ D3604E6E28F03AC70066C366 /* XCRemoteSwiftPackageReference "MarketKit.Swift" */, D3604E7128F03B0A0066C366 /* XCRemoteSwiftPackageReference "ScanQrKit.Swift" */, D3604E7728F03B9F0066C366 /* XCRemoteSwiftPackageReference "ModuleKit.Swift" */, - D3604E7A28F03BD20066C366 /* XCRemoteSwiftPackageReference "CurrencyKit.Swift" */, D3604E7D28F03C1D0066C366 /* XCRemoteSwiftPackageReference "Chart.Swift" */, D3604E8028F03C6B0066C366 /* XCRemoteSwiftPackageReference "FeeRateKit.Swift" */, D3604E8328F03CDC0066C366 /* XCRemoteSwiftPackageReference "BinanceChainKit.Swift" */, @@ -8550,6 +8551,7 @@ 6BCD530D2A161F4100993F20 /* ICloudBackupNameViewModel.swift in Sources */, 11B35056B69A06C8CFF3CBB6 /* BackupModule.swift in Sources */, 11B3598BE9C7A456A70B5DFD /* BackupVerifyWordsViewModel.swift in Sources */, + 6BE8A0822ADE2FAB0012DE7F /* CurrencyManager.swift in Sources */, 11B35828C42630241AE8D0E0 /* BackupVerifyWordsService.swift in Sources */, 11B3534EF58DAC9E15DC49A5 /* BackupVerifyWordsViewController.swift in Sources */, 11B35E08C957B79CF373E9FB /* BackupVerifyWordsModule.swift in Sources */, @@ -8836,6 +8838,7 @@ ABC9A40EB6EC886116806130 /* WalletConnectSessionManager.swift in Sources */, 2FA5DC4BBDF469873662BDEE /* Eip1559EvmFeeViewModel.swift in Sources */, 2FA5D3C3D3AB41202B592640 /* Eip1559EvmFeeDataSource.swift in Sources */, + 6BE8A07C2ADE2F8D0012DE7F /* Currency.swift in Sources */, ABC9ABC09321233E1727A8DD /* WalletConnectSession.swift in Sources */, 11B359C05619611CBCFC89AC /* EvmBlockchainManager.swift in Sources */, ABC9A2542EA47C2ED85C06B9 /* WalletConnectListViewController.swift in Sources */, @@ -9164,7 +9167,6 @@ 2FA5D61F4FA6E818D25C4A96 /* EvmSendSettingsViewModel.swift in Sources */, 2FA5D201AED8FB83968A5220 /* StepperAmountInputView.swift in Sources */, 2FA5D069D16C6119C970EDF1 /* StepperAmountInputCell.swift in Sources */, - 2FA5D66EE76C7CAE38843694 /* CurrencyValue.swift in Sources */, 2FA5D4341C017BB619D745A2 /* EvmCommonGasDataService.swift in Sources */, 2FA5DDDE9097C0CD9C0F5BD5 /* EvmFeeModule.swift in Sources */, 2FA5DF34B11401B29082BBD2 /* EvmFeeService.swift in Sources */, @@ -9433,6 +9435,7 @@ 11B357F36D1D90B2C54999AE /* BottomGradientWrapper.swift in Sources */, 11B359425D03F504ECA51B1A /* BlockchainSettingsView.swift in Sources */, 11B35FFD159D864F6D914F08 /* AppearanceView.swift in Sources */, + 6BE8A07F2ADE2F950012DE7F /* CurrencyValue.swift in Sources */, 11B350CA618DD7BBA452FC33 /* AppearanceViewModel.swift in Sources */, ABC9A13D78DD5F176A170B65 /* FullBackup.swift in Sources */, ABC9AA39ED35D6EF41A5353D /* SettingsBackup.swift in Sources */, @@ -9886,6 +9889,7 @@ 11B356C6E9FC6594917B3FF6 /* ActiveAccount.swift in Sources */, D02A67C8272A7460009B2C1C /* CoinTweetsViewController.swift in Sources */, D02A67C2272A7460009B2C1C /* TwitterText.swift in Sources */, + 6BE8A0812ADE2FAB0012DE7F /* CurrencyManager.swift in Sources */, 11B359F73F1D626BF832977F /* BackupModule.swift in Sources */, 6BCD530C2A161F4100993F20 /* ICloudBackupNameViewModel.swift in Sources */, D09D76942A2E07BD004311E6 /* SendTronConfirmationService.swift in Sources */, @@ -10172,6 +10176,7 @@ 1A564D02348C91416FD011FC /* TraitsCell.swift in Sources */, 1A5649CEE6EFCC06A10F69CF /* TraitCell.swift in Sources */, ABC9A3C3FC55AB33A9896382 /* UIViewController.swift in Sources */, + 6BE8A07B2ADE2F8D0012DE7F /* Currency.swift in Sources */, ABC9A9AC7890BE4AAE7DDC84 /* WalletConnectSessionManager.swift in Sources */, 2FA5D18A57B386FD3A4384BA /* Eip1559EvmFeeViewModel.swift in Sources */, 2FA5DA30F665BF2C170210C8 /* Eip1559EvmFeeDataSource.swift in Sources */, @@ -10501,7 +10506,6 @@ 2FA5DE6911CB4127CAB11F35 /* EvmSendSettingsViewModel.swift in Sources */, 2FA5DF3D135C616A61B37292 /* StepperAmountInputView.swift in Sources */, 2FA5D9A3C943976E38293621 /* StepperAmountInputCell.swift in Sources */, - 2FA5D07E79859294E1C86C9A /* CurrencyValue.swift in Sources */, 2FA5D6CF72BEC8CF1AEE3F9D /* EvmCommonGasDataService.swift in Sources */, 2FA5D4C0118B480BEFDFB082 /* EvmFeeModule.swift in Sources */, 2FA5D98FF7412EBBD2FFFBC4 /* EvmFeeService.swift in Sources */, @@ -10769,6 +10773,7 @@ 11B359EA8B77C68A8D9BA4CA /* BottomGradientWrapper.swift in Sources */, 11B35B6E11AE440A79D53E0F /* BlockchainSettingsView.swift in Sources */, 11B35245CD0D5B0E44E413F4 /* AppearanceView.swift in Sources */, + 6BE8A07E2ADE2F950012DE7F /* CurrencyValue.swift in Sources */, 11B35A18AA61F8C06AB1C15B /* AppearanceViewModel.swift in Sources */, ABC9A2C4301447E0EEA1D16F /* FullBackup.swift in Sources */, ABC9A99861B1F83A19EA370D /* SettingsBackup.swift in Sources */, @@ -11299,14 +11304,6 @@ version = 2.0.0; }; }; - D3604E7A28F03BD20066C366 /* XCRemoteSwiftPackageReference "CurrencyKit.Swift" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/horizontalsystems/CurrencyKit.Swift"; - requirement = { - kind = exactVersion; - version = 2.0.1; - }; - }; D3604E7D28F03C1D0066C366 /* XCRemoteSwiftPackageReference "Chart.Swift" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/horizontalsystems/Chart.Swift"; @@ -11659,11 +11656,6 @@ package = D3604E7728F03B9F0066C366 /* XCRemoteSwiftPackageReference "ModuleKit.Swift" */; productName = ModuleKit; }; - D3604E7B28F03BD20066C366 /* CurrencyKit */ = { - isa = XCSwiftPackageProductDependency; - package = D3604E7A28F03BD20066C366 /* XCRemoteSwiftPackageReference "CurrencyKit.Swift" */; - productName = CurrencyKit; - }; D3604E7E28F03C1D0066C366 /* Chart */ = { isa = XCSwiftPackageProductDependency; package = D3604E7D28F03C1D0066C366 /* XCRemoteSwiftPackageReference "Chart.Swift" */; @@ -11714,11 +11706,6 @@ package = D3604E7728F03B9F0066C366 /* XCRemoteSwiftPackageReference "ModuleKit.Swift" */; productName = ModuleKit; }; - D3604E9728F03DC00066C366 /* CurrencyKit */ = { - isa = XCSwiftPackageProductDependency; - package = D3604E7A28F03BD20066C366 /* XCRemoteSwiftPackageReference "CurrencyKit.Swift" */; - productName = CurrencyKit; - }; D3604E9928F03DC00066C366 /* Chart */ = { isa = XCSwiftPackageProductDependency; package = D3604E7D28F03C1D0066C366 /* XCRemoteSwiftPackageReference "Chart.Swift" */; diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..806b9f01f7a382c322a3adb1fa8512dbeee863ae GIT binary patch literal 2317 zcmV+o3G()dP)-C@C*Ag&GJ1GhHDw1S2-$ypUS*Rn`IQ6#sKNV$kh=y< zDI=6kFQ)o!3+VQRKOpC>X38RkQ6ZoARyW;Yd@?S8?(S~S-sgV16Pn2c(E9SFKcR>I zI*-2F(MI|AZ6e1@`zhN9DeJt|J3adPYYX`FvqQ?k6+!?z9$&l3zY zCF<&;zM9)82NbI5@VvfY0mz#c*W|BW@6n;n?RK%IpfOj0ldLk7)}zy}q27NyNc}fe zQjVC32!|6EKu`VOH_M`{2m<)l%5`K5o#%HgTKGe%|JMSVS5Zo4NznSEO$l1>*<4Fe z^?RXEm~zEHcqcoO9QyXedw+D_@A(D$TgT#a6Pkh+=iG2L6)UUg3`h9fe)@erjNrXE z0!Kfg1y$2%<(=2lcTT^@1Gj(p5x>^==e2ZkX3WPl?>4!i*Cw)U@M7^^8~Bt`{OdYsQ!5nRswLj^4L;_$^`kVl?6?Btch%= z-Y4lQ;ODiux1Rli>K+O3<4Axh8t&>NYlwf_7x|X0cNb0cK+}Pv=g94G)8r+$#$Hw? zt2G_d zDw&!@XM7)l*9{jl$$_6J-h4``TT6gSPS(b&t0~Hc)UMwkx{Jh^>DAZ~6oY_}%xCV$O z?P@A*xc>l|Wy}dcgK4m4)f_&5N<|cl7BGA{Jh~CIVN*=wC7wxSl`$&-W7DNQjfBc! z#dE{q*^U_+r! zm4IDfL9_;AiI^kVb0WU#@Pdra`D8OEM6#fOv$<5YJVE9E;(V;8=(}qfMcr3%xN6@0 zE@cyFynfrUffUl>o;+2fWaG6;^9D20(w`f_p51v zbU6R+bzBC|D4EEfJJiud`gb!8qD3;s;?8DlPr+QE^?X&pK=Y&q-m5CN-aoCTme<B zWYy*Yt#ck9?xOyiD=G48AGL=iZ69cL4<^lIU}AOk0XFyB)gax<^dW>i_1zBj-Om3s zu@n8B63%?338OiVG??pwqis}NT)@>Q=v2=ca|QKIUV&7mte1x6o6iW`+Jb^dQ#l1gj2O|z+VKbQ4(*YW2 zR8u1GW*g6aSVPYPwdC+0;opQc5M{nAWDI@D%47i;>;81KJ``|vFm+f1j(+b?`L|f` zN$Gp$*9sD`!BO?7{@iCpQ+Zjdap&73I(Q?PhksClfS=Gp*XSnf#@e4HTxS{DlPDz7AW%qvpP#&(rMbgCvNt^K%=Ll6=w{8qNmis*IH8= zJQ!61NSDA{Z5(Ei|EJ2RngY3CTv>n>t_XlGbFK)0E_1F3fYJcj7rH%TnY08j=Z5cb zAv2aqSpXn2^wwf7e)4N;~xSY0%snuavLBoz?@xEO$Sf|g% z;4$^!f1nT?W!Dz5RhsP|08>s7ULSs7C{T}E*;8m1XdDAa#|TzX>X~e5@F1lr0LORl z-Q_7aDq~aOpt6Qe8fjv?PiOI}k`efxh9{1h_CF~Kz{TBK%r`VF@#D$DfC=g~L0*Pd z4T(&(*8w!YvGztjM;pzmA8-uZW-{zfG0bb@+@8UMcgF_^p@dXau)0sj3Z7L89nPGoNx7#c~1t4`7FBI{S32fE6r__0G0<$0mh5OeR6h$39>DFb*t< z7Y`8{M>!|#o@u}AQ601zGoL#5$(Qu{k&olo*s6NwgY#)^d(8z>&<5@vR#Y{d#eFq& zSs{amURhBRyJ14m7P`#PV~+QaD=Hh0t1DB^aO@J(KF;EqptSYh${}&QqsEAP2=!%L z0RDY<1*J`{p>d8RvBY=-WkN0B-?w6ylwy2Z0&89_@$X-ju%~~}HKf?Bv-U&dC^DRo z!r>e2*4bef(Y)0SHA3RZCb$0 nRcbF(cB{<2#lP>;x6gkCrZeaoZ2T^U00000NkvXXu0mjfGCXS} literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Australia@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..105264e158979e38893c0db3bccb81a54ed5454d GIT binary patch literal 3570 zcmV%P)5_K~v};QCBEV)Iu}}3n2b91`bf5v;&5Q*qEvUDhw*10osmEh`&{%or?Gy zqa_rIv>~w~6tp2CF=-3`SI<2KKpad&e=H5IX-9iNS5#H z^ZD-m|K9igz7v!nyxwg&q}3M-x0pD>>*>C5{*Yo_*K^vhd_Bi?{&Umc_bR=%eyWly=amngmtyR<*9v5%QDIcX+0c5`;$0gm+Y#7ept${#m||99)qQLVl;- z+ce}oQ?c9>IqOl}8&^KS_24Xa?GO$8Ph)IxZ>$yiaT{7Jlsv>z9XY z1W5hN8U1P1uSQaCZZ_E)!Xxy$a__j!#nFy1Wq>5U5amIKV;d-`pYU`~xv%}{AlVlfdAS|g*7uWy2i!ck%lzFI5?_85I;Q@q(L{SF zjUYUTD0yRn`XrWYvoXhCah!-OC9r1fm;mDFdxvxC~Lcr8SH-Sa5j z=Mi=7vr{SEfau6Ow#=*c8#SP=VH<7`>Rmr>G}TS!!ESa3`BiIa1Ejum?qDk7{{bSU z9@nF;EuA5BIiU4nTWY}V+qaAPro8F^ZQnu32+ema?1#{T^{dB*q7W;gq#ndKlX~Ql z?*C?G81ZXr>L^X&Razi5;OnpNlzy9Utlm46vX%#K8ZSs6q!2gl&+ROKsp9a#1G~}M z-=1i(HbhFj_Q`3=fYdV+07yOlAChmx*>hF=|Hmm^A#?#r^0~27alXekj`_0+da=!& z$fL^+9mw^?-$~Tfk?YD;ax+ng3E^kktB}WLX;eu*WoEjiBn}xAaF*JUV_}Zc2%VV- zCIcrvzD9kDa_QxTL#b=mZ;`0_irO*Z5#`{20Z4uAFBefmaZ%_T_^<81ub_=@eUi=^ z02F$T(F`>V9~!0&X2@c*5l=e0s;VY5lEr{3W7qDu zrT!-Wwk<#xRO0qLHh!8+t5QI^kfTR}t7qTt6$B3=!EDTCB! zy|JFOL**fYr!>{g~C=Bb&MI- z!GpR{$LtI?m;az-KxZ-5em--+15*wllGQOc%vikVoI0f_>UUN%01+N?PKWut&;Xca z?Bg0PUA{$S+fI>H5ajwE!cY%62w}(0v#bRfa@av!FO=d*5XmJ8fVW}N#cipb~73Nhx0>EP1Y%mF`|AnSp_)U(z%105MKe2+vcsO zWC(2)nq8D{%c!ZjPi0#JHh#gpA)zoCPI=9Slk)qjFRcxM9R?VH@r4>=!1lxGUb29wx*p1^GFYmzT}Vu$}>q4=@23fGAx#-N=0_;b?#f zB3oUO+4`a(KVu~jYN`=)B#`6LJr;+Je~aF*C!C*U+VG1`NH;axh38yRS5k zcJ&T{GGVL~bu1v$ibS6g4c{#cCHiWDiNSP9K_hfU;t=Tz1+|SdM`S3gnI*GO9z-V8 z2w5=Mv?a{Ez@*eY{~Yvbwnjp(=6N%vdDIaPfQgUZ8Zq z`+S{|Wm`CM+(RVX`HziXu6AIvmi%HEJvruaS?N-M)VEu|iCouj$bDHbDV;;LQzy%9 z4ABFjTKx5ZFre7ZpGT`bXg%_&f8Xy&H9p6A8XGp`hJchgOpv070_Zu4zk_yMuDlic zJj4J#wInWlH!aNYg7zKWg=cu~;yg znWe3txC;@5g*yu-gMC9l<+Gtoq2U?iaqwf+@ z7fcyIDv={^%{Uw;=^S5h6K$9_RTl1*utYO;=>$y?KeF!5JkYom6wUL%4tJ*q}R+2>3NEOJ@Ak|h@xw0B9)&R^6Fe}X=ZL46W z1^A7l9TsRnUT{rO)M5X?`Eg7kLYdCkIE57!QMN_Kxjz4swRP9GiImNy2D93G~Yhp~9XIp0JG@ggH80@h@A>_eEO^t`T#k@s8G$ z!XBMvdkZEeT8$P(L4kFo`{}oKYtD`h8-J&uD_8+bA=vGG5 zq&k<;N*Is-XidQ88yD@1wd71opaq|e*lh0-Sm3T{Kjiw=ouV%Lcw4SMXnm)0G63Q? z&U!DB%giKU(Y|VpgkH^xV3~V2PK2lmhMG!}(qYmZfa{b~whXiIleB1GrHgc7*`i;# zaN|f9gDt$O3`;?#0~4U##x{y4nsg09wFyX&pI8 zGQ>LL^X9|r0r%a@nLm}}AW6_GbxGq!gfRdQpw~r1iOdfE~8$WGQ5%V3G zQ^_MVhY41KX{r0^M@G}5U|N#&9hy}knc$eCmIK6RT7sr#UyE43^^V=-5xTn^Pl6@~ z2_R^8Oe9|+W>H?6qx%_so#-eLh;^V{EaJU;1P8Yd zMBEHe@IJA*SO`(dn-dbLq_s)Ns-oDgb4n*(!YeeJ0Y=Eja{I~4e?FXtcR7Omo;J^v s0I{pNkY2&Wy8@!qJ*^@#yo?wB1K2;H@qTb{ga7~l07*qoM6N<$f-C{4f&c&j literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Contents.json new file mode 100644 index 0000000000..5e87189678 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/AUD.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Australia@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Australia@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BNB.imageset/BNB@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BNB.imageset/BNB@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ce8069e946e844d673342362c70894a1ec10a93c GIT binary patch literal 1292 zcmV+n1@roeP)v>qyi!#6@+?-l)O&ll!vS}cz8MZd01JE{_6K`+MA!oECqW-}VdzIu01AI3fB+HtK>SI-`|glG z5Ya9AFkdd!&HnG<9XJBP5<=SVMX!Nyz&{6IhY%HwUBq-2kP!#G$Uk9MFp;a}8sBvl z(n-L>KSyu3O}ql6(cZ8By=#4Xo0IPU4i0uann-NJ6F_o>y>ZgU8_IOTmw%65_&&{_ zioAgDb>Mq6|2z$brgIwwNXSrxSC1Mpdh`)#vI$!~v>_B55{|$Hgqv7KdJ8US$ctJ5 zpQk?!5!D1-z~uMN!jWt~OoNfD2qb*jI}87;>@V+-gq4_g3Y#4H6k8CnSgrBra$;9< zfUC`H+vElDzBHul(C5UiL`6YBoU~j4z!nxtxA1Lz2EcRf@DXxC+OpOhD2AfKWl!lmcp zMl-8NM}Asf7JQ=N$Dy)SQGWI7t8be;sj;bm6Zu%7sddN^**^&vs~wc& z4U6~HlNZ!hnsUFDBd@h7Q8YK~RMEJgU&>*4>d6~Vyhw1Tz zw~V8IDVIE~8`hP|)iW4Zs#9W<3M$%cV%~oa7j-3;kgoY&7huLUe)@1U<~Zu!3nk>! zgsm;HwKm0sbr~B(5nXZ_rO?K>Ty2ciDYmIr8<(+xhiZ<=le>p*&^L2BPiRVI3ae&r zjfYB}oDhO;80aRPYCT~hZ`aI)GD8u+2O^>y=n74_6cj|XA#c&lagvYadn4eP8aKWV zbZ8;sF~|#+5yTHYdk4yN1vf`_GX))|#04(oWi6q1dizSYvsS{|3xWnu)WLP$RTe_h z?M#5UT)e*AEDdzjx>=|;J>o?C}fd>5-` z&U{(!x7HC>-aQoo;vQPz8*o93X3pZ8uj-bZ^a~tYnA6ubb6wFe2h}(n-iioU80KA# z<9S(V024h{{q=WsRJw%8H10E2`XwLSpM@Ru#=JiY^+xDs+L#j_vF zHB~Zn=Xn}>on7Xor>A=s|5eMr4KvffdfxhN5o*-Yi&hhUfQ3lNn-Ie_5crbP@*}x1`=24YAtGc6RK+uh3cN1h_~~1 zdVL6}Ab`f80JI^jG_2X*4mTlyyaLi-X5|Aq?L$wNVl8S&U!m&8vDox!RbBv16U?Lx zsJUB*Pr!pJ13KDiwP%!it|o%)v~>mw@6A;V>dt`JY8tchF)Ff}ODsgSaq>|-nZMf` zfP9ldTX%rw;QWwV+ru{E8X;<8I@5>Qg?Qc=o)sp{O4$$$x ziw`2DcBdVP9n~avd-37TVyTc|4d{4h@iEmk8xT-RQDCJ91e6f?RJX-aRxyYzrw%x$ z5|{aPL#SQEur4g6di3M%!@@Qd0vc{zUquuzAfOB!6GS-))B%Z7+;UMFkPC=!lml|e zm@^3{dF>h?4dPS0k(b>vV-VLloXV#GhsB@qcY$M)ZlfM$$WSIAE&@ZQ@;o?3bwJ`a z&QM#kzE5?rBdQl7N{JBarYzu$-A^6vmJyFqEocVSQwXH8a9DL%5>kIM&DAad;u;~8 zYq`KN3Jr%6bO!%kg_ePB@5uF zv!IC2GQXdIR0KyU+*C?s&#_NHDug5PS;fG;5DCB~a8NQ^9dES;6em($;2aXQP4$c5 zTwUpP`1NpWkwzadJ#m~t;^P-`;V67Ece}SvA!Ng~1mOQc3efv-zDCDZX{nqbt!F_h zKHpb3Mg*yw390ae1ZSnUZr-}qNj%{w6qFlM&8l0nR0PM!8d44%BNs^4fJB*P4nh_d zo`S|W!B#Y9TzHJdHNRdPtYvROJo?X5Boy%SjpI7xTjDZe%0aqsdvFn? zvPEDKq|!xT4kQ;iI*UO`WkGVSkh35;SI8-lT*un!_yL82@;%^5NH!I6Uf`aDR0xO8 zWm|DqoQN1i64iU*u+Ypv8tyEWP2V@k0#+U2 z@CuLv{IIk5P$&#CQJ9v>t5n=+sk~CfT_9c}Bjgvc2LY5-=eSnfS#^$c#cd(c5Iq4` zD2pLDtpLqZQ4v@gQb7?I3KGxNi}_`mMO6NVDoHPGDr9R&78Nop0Hi(sqtiSE>Q~@N z6kuCL#iUUoBuh9fz9voj-2_jfNz^Vsp8<+Q7d*+f;x@{JR1%KwH3cUU-tw~sq}}Y? zq&>m9$ScV>v^bKAe$z>DQx+?Y5dxOtY(=*CbZi29T#vaCj)>>dL`2 z^L}JO>}FILJp<1wYe_Z=xsC||$1>qqXH|YDHhkAaET51KBKp2eDh-ud3eTsYYOtKYZTowrM(gXaq`*>SIe*z$j#269 z4BlFeLOuW1c0O}J##8(=E1hSl{Cp48xTn;UIF;*cRmTqtu=Fa4@9;**V$zco7lEgr z@fX+O7AFfz>iBi5t;pprn>Df3aQC6COHHaWAS2FllpfZm4NAuvh5y8#VZ-$YO_K5k zh^6;@2C`kneG${`1(10b7l7A+U*Jw9+r7foXOdvmL7*f3lA^PI2h{e# zLgEEVgop&RBxpprBM7#ZS}t;{lxw-Pdz}AFXDRJ==gjQPZs`7!X=ZoNPWOE0yU!d2 zAy{7FPigC|7C=>V6e!t32p=9m6h&ze5C1lYcz=EF8g25M(Bmdg6rVQTie(#eOFF)rV4m;;AyAB-j)4E^MVTpkzODa( zFLe_rs(QYF(m@;{6m>y)-u7x;0L!XopA=Ahh%cHG?zE0hXkYyT#2-mQRnM!MF3d-~ zqQI|evGNhbEn>1NfNaDqicduh>Dvn!oQRmx3o&ABe;|LfabDE`)LunQh=~9eW&r-- z_g)u`1HM0_9cK}BqACEYJ6C;7|E{0S83|+!0zRt)nrNp=fKBYi z_O-jGVEL9D*r8Mt0tF#M%{k{eL&A*LGE41zA-!Gl69&qSU$tW6B&r43^Vz8ryfCehKfrkcNyQNf_Ao-oLqW zvsFKioVtM{jW^JE>6YcS=sbUV_Z!G!CuayNfX;QhEP;e!STy?$ERq;Y0qj0;73+UK zkKM4B)W{nRWOZhp4@WJLr{UB!6=#=jI3_$@1 zrbD( zB=BE^`89KUS+?$P(gl{aVz1^1FLe2wTC!!u6Ua(OM6|RTwZq0nOXWJ(veBd*KzDHH3%Ja8dAyo@d znsknIlCrR#U-RlNL;}O-@B7zDuRfg{SDenSqoWIlt!j`})}AIUSxS*Bip(l*SG_YA z&VInkoL{8Ia*;l*HA-ST*zN}~T+$qRD@Gk|h3O0I3W3^F?B6RjmX5Bn-dXr|)Dbda zYRLwrOr^+@mi>XseG|iuqrm7tWO{>Cb5?wz!ka7+34n0&i^mxGwhR;mtGmukQRWT| zpRyGnWBZp4ktb~t3&4b$z;10cpvqf?H(6Y}F~Xdo?wWTuMu-`WWWt*)uHGATnls2? zC$`(c^?QTnDxGOD`g4&&M@Q|V+IxX#x5wG5=c+A>;0`f`xvnm27rU whRS*Dem|%?%k=H@Lf<~Wi_V_@uJf4x0Vy(+BK|E5CjbBd07*qoM6N<$f?9n@1^@s6 literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Brasil@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Brasil@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2401e74e399c939921e13a0cbf5eb25a0c465afa GIT binary patch literal 2522 zcmV<02_^Q4P)&W6s?wyYm9!sXC&H*NHG>1F=n(xw&W7LzaEc%)NJJR+^u* z+S%DzKhBwR&i~vydxyaR?OPga5R1(-4c-J8i#T|_*jNrpEoV{P0-J0gR-geRE6I*sAf*7(Y7 z~D=v(Du5y!1AdmJIW>kZV*OpxdoUxzVI>2 zr-|sOPN$@DiH5Rp0Hqi*e&$(Uh&e*jO{)@4_z37ZkI)nP6m(ym7%IQjnelDtSgH}_ zkdi_h0XK{qaoRX|hEmd9lfzx0Lm2^9p}kGc_%;*`RJ6$vVI))$U~Buv8=(~H73=~Y zww@t04#?K_I-n>BTh9=R6qHZf>mqDDL!c4hMBD2kEImVD4sfIGbrFW1A&?a0MceBl z=$^sX2vDKzbrDq0;9CT!)b_dvqG!+^0jjipa(FCuz5RV0_~2%Ae_V^izyxa_QBygB z`bmSBH|29Q&Nzc#&3@n7=LNre2DW0#7g zKM1c3jOb5E+8jVB=f3Ii3>ljYA3r!BGOYVqk8s2hF!K_;viq!foP!pWJ3xiDr?dX2 z|M|7`tOAOHSN`yfR5bJ^_4Eu%i!f>X)eUmSKX$HGsqqQhp{J8m;1%i_=zp7gJ(Qx% z0V=dT8LDa9FO?cU^Jg#q_j0M9t)pj1IjYb6Z0tyIQ_S;0J;VCB>Hl38 zDF>+3_Ed0n8sElJReSD+EUJ12PYxh$Pbr5~PL+aAf{Y@ocH9s@G+&9c?Vf=iwCx4g z=F>55|Hi;Q_{#$`P$y!#ZgM3ij;pYqGwJ(c7#F^}VmDRS`S1#7#v&zrp5B%JWr zy$7HInRy0RGE`RE=Yz9q4AyRiSI7wmPYzx1Pzc3mYa_1=xu*C>rjWKMD74Jf7oV?eP4)LQV=I5B=@!^jNqb$P5#c5qBK= zOc=BmbJxCMZI^(B|=@$plIC23I=L=DB`@9B*O)jFJ_;^F_jYehw0 zf8jJk5wP($`liIK*|c}kdA}GX|AHPd5%G7?V)tsgZf22~!_@&5_MfclE}E8NmybgS zrv}qDd+*EA$2vL%$eaH?m2R_D(2t0cbYX^#UQ1m z^*w4+5*eSIpc8UHru-zX8}5=40NIdDNWA1Lw8e0p1npmxt!HJRs~2?huRZ7R@DuM| zeO-C!|4;=Pom38~9k)0djLRm))05N#m(wa~jASh%Ie0S8BkDW>h+Ag#m5_*55U3pCXN*-J-C zVPBpiiPWbHVOGt@ z@QNF4?*>mrxER!OzcrBF_BxC~MY;9P6BrS*R zsH^qjTpEUbq(RNaxt(v`=J+#IPso973yw;s9BM$%diPyPv^s#GAy}GOlf8cCn#_HGE|YpN9Dbhc4S3OX9d;M-5DmzPcn?0dr0 zGn^R$?w=0KQGCt4Q%KuCnehLt&m_>L3Utmhl)~+}y)HtrSO=w~BmMpqXg{>Q8$z>Q zkdAqVY-GmmbrGudf~eJ}f_UmnwLOF1+TIPJT(V4M&k%&RcSC3w?NiY+1f}iW5c*{+ zz4Q!0YkN18#k!$xdWJA)dpDHL(#1}ChOlURH!Sgs*UuSu2!SGSo<==D#A2yV+Oix# zQDAa&10sBaZ-_t8m7uMwjo3dP+#lyAk5Z9lIM}9+mi?Xf>zqXiRz10_lQF&m5z675 zZQcCfp4QBLIYSY2Kokk;p))_*_(a~Zpv@2MYZoeYB@@L05weK-iZz>C_O$1Fv*@}g z?K>OmQ>j?1Vel2vedk@1hAOENvK k#t)b#+eHm-F~i$@1EbdT`JhADI{*Lx07*qoM6N<$g6v`1IsgCw literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Contents.json new file mode 100644 index 0000000000..631a181439 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BRL.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Brasil@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Brasil@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/Contents.json new file mode 100644 index 0000000000..2001bc9ad1 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "btc@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "btc@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/btc@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/BTC.imageset/btc@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a0512d502f9bcb9372e79f7ee4c5bd97687675ab GIT binary patch literal 1856 zcmV-G2fz4j{ZG%0rJ!f~H@g??n?09ApU`h6j&s@&lvv2F{F~Tw7zjS{> z)A7897?(r_5E!*%h`2{UdkDBEfwESa)=y9FWZ{^A5CBT>-X3woA{gZx#lR!@nq@*< zj*M+SgaGiY1f^p!Q;&`lz=R*c+aSlE43y==$mC8AJi?O_Z{`O^1z?(Y4LBKWuA;%?r?`3-H06O(mTAEIUuxO&c)*#jIp&91y%xWAxiO zC~f`|w{-A>zPyOCtb3_LF{&ucpVA?Wxi+GLQUY5_peYXURt_ZeWWA=_ z>Krz!7E*`=1cWT%dg~0ra66aN?WnWzMtjQ~9CVzUHs+HvmiWm2*r5uJU`gN^ZN)`U|7D@bi?VMY+`z%$*gu&N1Id z|7(Zd$=5AUnkjSIgy^U_AFbC1C|OTb0>F{1QY6QU+~cegqhn}3_;kez+;Y2e6RNV) z#`?g8Z>6~Ki9N0qiA?NlghcOk#d^U%D%{D*{XL<|N}KLFn^9IZT+SXUQ_rtWBj*fa z+Ho6vPhVltLP~rEzR~&=!_=MuAT_TaltrZ0lk-!pE7MmVqL3afVXv8qHh8;>7PYJ& z8tI11)mi6ARA?NM}4tLb(K zH1Q{R1$#r}?)I?S)hoZ@F+aIPH`hujhVz@RFXSH#tVNjfK&Z?Wk838g(MB{ZS=%E> zwHBDI@2al@E0iJVu0O;tOzsQ4=P4BNZ&Mzu6be?F*8_>#aXZES^f}Vp7nQ2q2K38k z$kqBj3*e_(6O`n=x=gj5{OsTi3K|C=5X!~I{(7wTcV~=PL@O?G_v1;VT*$PLy|owI zUBs)L+iwzi?{-wBUW|-w)#IyfNtD)1x7KL6X9M+6DOMFYth~plgQ>`f`TI-aqPM}v zW_&B)u!2He37Zl~m<5ke>xmvcyl%S?FEwi^R*g4Vp=0XxG-1ZMerbv+Q})iNs0R<= zrye^1>*+zcu$2F|nBt(hTp6b|S}^MF%IP;XOeo z1r$0~dv0x}c=N+i=ba>uQb6HI;i|56AKrl?-6){Ym0M|5zY?3OzEL_x7gK8un)V`m4Zek_ zD?@OZ-OTWFKYM|N^pNYxvLE5W&!p{8nD0+8AL6zpUglsl9Ivqs=inATvtYXba@b~r u2oA0j95d{HV!_z9xTXLW=pv(F0CesYoqN-D5 z7E)&Af`jM8hEfoLvxPly<;+P0)zxxi0g(!Cok0OHCTZ?}KaP!eZ5lcj($UJrh_b~t zZ8~svF(v?C=bv7<)y+S3wA@&OSU{#o;TM3iP|gk9J?w}kv=vf$iNV>{pk_!~qA)XX z=fh6Bfq_C|FP623&iWDyLPy3t&?cqr@G2M<5Zxt?^lwTDkLb3<$tm{-S9XOQaXiYdD}Rb;O#iS)Jq4lsq8e^+Jb4cLA;>%%gqipXwuP>i?hTfy5bQn zp;Th%-u{>;@SAG8!}}{^3SNUI6>RBLe-;J#u4cd|n|-)$LOXf9HnH67K!YY(sCo_v z%OIQP3t;5Vdv>$@+N>P&J!dE~u-NE=QHm&tiYBER#ta^#%Hx#oWS9_ekLI;npCYai z5^E7n-vLdarPh*zlqM2ydQ5toN+5d`5(Fk22DpQ?1ag-Qcdz!X{(To+It=>@)5_z;)&wfA2e!{qU(Ll*AqNJ(*jZefjOHHWIMV3WRb(Pz@STUpa|5~ZgE6p zm)}K)6YLEN-US}+FvK9QGu85-Wvg}1shLT^BmyImi152nR*_z$q z`GD4%e&EH)TMP`ae2^YRkg z{c$pTlzU-PKpdVJ7m`h>SI`7sFgrg|p%kxY|M9OIv=*b#2N)L;)~8;p;HN#F{$-=o zJenxQYul}C7zefL*_A}r``<_UAVSk=XAS~ z3ozQ{kObm2Xb;L1;=QH^SfkF{3F1^{Qn{s=Q%E$YuDLdWt?azdp!GNkY*BdHiw!RmOdlB^t99TfTd2DGUu&k>;RvmLZ;WUdpZUDGxHN1B#S;|&@Zu`RfiJxoR|3mq^A z1qJ!Iah_EeTTG--e)cpPFWo>7IG04J-OtUVO@iSJ^GF+BQm$f2D&Y0#fJq>%H=`R3 zJ(H|WCDyDF%5Mf`!IY6&TOX~_SZoX}?6inr{~pz7szrV2r8Xd zqwSNE;d_Vc&?Yx@7C}Xd)#3U5^TlM1MGj^2=Ya$%NE^YFB3Rq0{GwQz?XEC^Z*u>Ux! zjZ3A62~UAh@9noq>Y?=ueR*MVF+x2G&+GkFE+b#0A}j^hN;x270`p5xs9sSpzNuR{ zWf;HPrAEfl8b`p?f!ah|D3wy|bTMNNT( zMWt?~)Q&5}+tM?=eZ#3>&gFt+J;Hz1V|aVTPwpsJ4u8*u%K!iX07*qoM6N<$g7DrD AX8-^I literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..83a86cd1a37f24112d35dbb44821d9c32a713682 GIT binary patch literal 1166 zcmV;91abR`P)GmMc!d5voQ9Lg5S#^qJD;KR)iRwX@z@6m2f$^VeR#K1^Vw=Q<=Er{GzpRnYR}3H;ZQx)=QN6-*KYg9OmH;O2J8=i~|9 zk7m{R$@nP1jq6|vqaGl7FKQ{H6Qcsi@TJ;iF4r!j6VC;3`aB`(5Wp$JaxuYcvjS-(iGvz-KjM>UQ^|}mX_go zW?Fp~I6Nx*tkXq0V{d>_MmWrR0mr{|ot}(B=Gs-ziFN^;7N!aZTrM2g#UC&)^i*|g za(gn~$rP&9U0zU67itvk0*ER>EV!{jf22|)do#`Vn0)RoHq51nX>0hGQdO4C~-lm%$AqZ5JApWaH*JyP@}3s6Nf z!$WG4!z!e_dLhHp6Z+GigJ+W=s_>tsMdbR(Mnwk|F5r9&cGa(|>m>+YxBaAwC3FOtdzZ^yuL6y3aWaMbeM6c^QM?d+W<0=%0IH>X>np1a?=!b3VsuHY1nL$(zkunh04$XPziIz6 z1eW7#7swb~{;q_t0(h~)(@v4*{lS}?W@}dTcFm@?Ik=N2V?@b!H$%e1d$$bF7g7f zt+%wx@(Hv$LQJu((+!jbBSGaBT(qhuB+=R__VIl|)+-qbvvn+x2@JMaW;lRMdXTM` z?jbHa7ohHd-f#s)m}+VvsP1S3+gKfNySjAk)8Ov{<=g^N|NLy^q>MoO{8rlok gRomw`YHy$a4;3|kBoP@vQ~&?~07*qoM6N<$f;Qa=!2kdN literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CAD.imageset/Canada@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd28417c2d13d44c7a0576a2dc338ec3dec6f11 GIT binary patch literal 1691 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 literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CHF.imageset/Switzerland@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CHF.imageset/Switzerland@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8b53028c58670d4dd0a0b5791f1293484ffce2b7 GIT binary patch literal 1171 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9FJK(?X*8o|0J>kxf-4>jv*C{Z|@p*2zyJgfB65#wetPXE|Fhe z@p0cbeDvEO>|+&pkVEc9=hoiVj;U39Tf-x|=Pq#N60}yn!C7UNl)fe8pza>$yD7(i zKHF5@dGF|(s+sx1|Li$9)h0gvot{><|IJ+qk(AkIwRTOdT(XRFM*ZFWXAUoTHE&hY zwxjQ^ef)mRuJC*A=LdDttddVs{O7Iwy-0e_;Wy&dF+yJ4VyB-y+&k4KU&fjtz9M_w z&i2v^8o6)0&dm;6ZG5h~Ub10+)}*`ZK73QsU@sP4eSezIZqfdlt1HxVKj-jzzTa3K z!7O^QaPdOJER!7R2HSla-K#|AfBy6S<&Lcnzm#Pkp2oQ0hqYdrqRBR{hszl(-un2w zS+=-Ue)-~s4A;c(#Ofb-6LbSJt{RagDyv-o=5O?9KImx9RPk)}3axAg_l9{{ zEI~&ZrWi7$@;F4Y1|Ryj+5GzJv%mXiur1|3@a}f^`s?cz?oKyu;Fte+{OM|g)!7=G zFZnxW=GMP^#Lc;`{D;7)b$_xC%-e5pdIyJgGQ%l}1|zlwJ&YRY%uNY*1725IWi~#G zcz@u(hF0nOw~Ff5ZF{ZW*O;5KB>U?`v3z)Xt=B2mmpAB-y?%@nhvPDZOkRKQkF9_9 zm|Zx3+SEakIp7%7r5H?BPKR017pKJNXg@i0Z|3W^Uu`i!CwlWPmA$)G-cfMsx8O5- zt9th=NPXGQ;ni1I2F9i3mSI7RY0C;%{w1qTaI)a)|jl)u}bxV~hb za4uzH*tRWGo+{nm#C@&rU+kY`*;C7wE~qRN41>9DCW}DxmLoh4lU?1JDmX6*p5!pd zWM6W`u2A{F7Kf-?f?BaR~zs{<`?f@ zU1Muayl}28?5>TlSsAB@o4MtD+dCWw`k5x{HLIOocKX@HXVbPF-n+o-{jNE48`Ye% zc0bFqNzh=ZcbRg|^uXaubJdUfPd@e_?$D#7_rG+5e+Qkb(%86Pa&yy_eNz`bE-rt1{P5|*TK4wYk!yEz SZ4&~PAq<|belF{r5}E)5c_c&t literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/China@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/China@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bf73f73d93944a78e0e3477a361c8907454057bd GIT binary patch literal 1165 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 literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/Contents.json new file mode 100644 index 0000000000..712d2a64a4 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/CNY.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "China@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "China@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/Contents.json new file mode 100644 index 0000000000..7eff38c011 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "eth@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "eth@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/eth@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ETH.imageset/eth@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f1fc77d02f063c4a67fdca7c3ba7abccb42cf1 GIT binary patch literal 2948 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 VD7!~_-)wq@!*+J?VY3t&wT; zv3OZ2ZA$nkU!t>tUzR}38FzJyKPxFM5RPEkzCcgYXzVju>;vA~js~{m z3R2n_510t(Vz8#RqdxAL=nG+dJ!AYQN@F-|=&ASCu{- zj3K~yR(}Q<4+_L^FtS`a0M&l;R(ex-A~r8OATrfu7P`$WB66soG7!$lr;${6nF-^p zUSq`5XueMten1oY*+ULew?9M78nA~{_GZKKp}l|WmnvL;5Bem@3kUQfkp~BQZq)L-7|5IhyKl>k1p<$ z#)ILp{Dj5>)mfq>0}dY?rxWkoF|Hd9jne0xdsjs9`ND@ZAsq4Nz;jelG8^|E)m4*p zs$s}*((i5kbou8}@l!^2l2umm)+b~$L;pM@qMS=_cqZj_tnmPgkgnfKWa>{$=E|&y zW-OFPe~)Yv(T@~K7;d-mKv@m&?4A||7Lz;okr>DGanDB^Ja9X49me<{xV>FCD2F_I zrey}$jWP!yTDp-H#bGkT@I5!Ze=RagqZX*ZmLiC1A4_zE?~c344AK8Lcq=|jDoV^b zHX2(TaH?^LibPRMB^VwTJ_wRkn6Iv#lSxjzdq+keQ{CM$H-+b2bn%B>rX#){VEDv)T)`KMn z;KR($XN&0P%ZNg)DXbUA$qV(4bNwhQ`jMh zObel7=Uk&0rEn48H zz#+vw0o(%)u3m1rqxFuiklE$1<%Y=psa&bRK<{-m+gGu4^%cwCxGxM()G%EymN!Nq zNzZq@OjG|oC9hM_6~f{N8!u-r?V}yr7EGr<*wO){5U8_Cv7=)JL>r4QRVXRf`nEVK zwcaC~5Gk8XzYx{ETx^;i5mGy%_ou~}&z9|XJ5iDW5Gbb`Zc?S#FF+QYhEB*ytP@t# z577B|4^(@+&!;VaDQUncaR55SKZ>1Sov*JX-Yk&?^mt-1gBb=zPN!2WxmA2gLYZR0 z*v0xB5ys9gw!w7}NzC7PO?h!x3Mv>JYak+zmOJ(x5`EFa4jh{WV6+Z7!3u0B3ZTG7Q~jcg z=PW%lK}Mc81%5fYV%A&Z=xkPh8qExYoVn@~9i3hK@U*|Jk?~D_cv@6@WcF&WV6+ar z{&p`87>Q+LCF9()k&n-F(ngt3w-7mjo+lrle+*v@blBgUs-XY?002ovPDHLkV1mLZ B?Q;MC literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/EUR.imageset/europe@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/EUR.imageset/europe@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ea64827f128bee67e4cbf0d32966db9a02f7f4ba GIT binary patch literal 2487 zcmV;o2}t&dP)btf}%0IeZU0T#BD&^7(au?#24rTB&ZLf55xzeh%uVrM~!Gg zAAlz#hJRH)oH=vm4x=hbrFJz^d@9Lm*yD`&ZJcGXm1 zX{r)Nvm~{;F9o3!=WDNcVS7a=g)z22m&^60zuu6U&09Syz!5yXfoahCzct!~Jz1&26YdYPNo#DFjq`E(9VZ5eaT-HLCD&WJM)pl0u z4Y6`Bq#oFrWV!gD75-dcq5)6#rykmwEPF+%lT!GM^;;+F8(Ch%JJVlW?w~JIfHgbX z$O`A&R&0(66aa_I=1p3&qYdE`CTiQirg>QsLnm?6{2{)V~ixFUkVvN!KWHAD#TuY32EYjvDd1scQ3Zqy;L_xV0 ziYTqkfc&AHQ*s77BqVponjG_RC|KqV?OBmwaDWzNci4 z-9X8uXGJu0mIgAV6#!@b&P#&@&KmDme`C+*i=|RcV7v!xdb>@Ulw$UMvq-*H3Tbl0 z4_<$9ds5i_WwQ5_V@N1+gHYtC@Gr%nCz%pHV4YokoI=27?|nbrLPyTbr)OSXQSo|Q z>vp2Wzn22$=iQesC4HfIIBk=J!UrJwfdFAn&`RN86T+laqFC5oBASkTFM;6kIqk{Q zWSUTfp~qkE;ZhLSh;92K84PD3Xf$P}S5L02n* znV=}93xfF0fhl0;mP3(Jf_ucRlRy*zCkvY!rJPNNaL`@`g>yxl6Gq4f=L(Yfh~|0W zTz?q6SsrJOH3}yit~?-GJsJv7%}* zxTzwZFoE&Mx`&S!jLea^1BlXeB=2e#w?6tRX#m;D{zJD2yMK}HzWwj%^ZUMOrq}!K zrvD~Gl?RlJ3Iz;gZkDaz?XNbxwwwkI&zxtf2JKR4sGBT06Yi)Ny`VT)sIQ+SU1(Q8 zLihog8>AM{`h#$6a{;~!wK_04_|7n;9ToCSb4BYw%$cnkFL1Vqh`gkYO`)7HdIBhQ z4}M}t!iEW-C%nqA3NVaSfMKix45Li}K_s$*0+Ep#5&Ml61t4@=`^fN&vszIBBjb)X zJ+o)NCO1?Lr6b`CT)M@eYvfFwJU%D#C}Ajs@(LPJeSSoY>IuxIp+TwpDK)`g4Ze*7 z&`mMn?M`I5aZfo$0rcQ~BiNhjYK7PKI z?z`u&g7dh?&F?3C>&?FU01V$h__VNM?T5^Q(B=KTvhTnmnL2l~V{fakrqp*Q+>vmc z6%uc-lVMN3RRU%eRd=Y+Q^jNL34arFzI(-bk^e{j9Hky;L9nH!OFyaw{tSK#rHg3w zn8j=Ld0N#b;|ya*!iKR5FpO1zVFFV?B4Vo<5dk%o8C3d7APP{UP&&zFC^c#e0ZCXV&?We@wuaU>2XX+?pXxh}c0$Q8T$(FBxur{wdDvvRa@N2-< zy>gTiOD~1MNHgGb5N^J?XBnA7+Y%+O9Qx%(S!;vQ=QXuCc}`VQlzNCqF-Vx9QlS!9 z4u$6o;VEtIXUrko!~;K${Bb>*A{0IVqfEC`tgoA@_|z-~7JJB*jULm+#q-iIaXKR$ zFN7i{MB)ynV7Ew9IAx8;<(lGBgC7VRuiyFS>v zL{{&?*O(rcgeE9QrI~7ts3j`bsuzku(eqCY6;$A%7vN`9=5oqsERhbuW6dCNER%xL zph%Mnh-6iSdeVv8sk+NYqC_O;gyp=#*u27XV|9@eK8VS^5hDnezoKjqQH)$l+GhUY zOI47K6XQYwEKmJwu_bw1d)Uxdexk;MQk9pj7*lf?*}^Y3E9 z1nnn_8Df-<(S>*>s*X6~WaTD4*wsy#p*>^?6i!T99%me2%~0^vL9$E)BKvsQqcRCiyBa+DGu ze!m#rH8Si=d8I4G5q6dnWrXnlgwT;uE)Flf@;{Kq;sGu`YHa`j002ovPDHLkV1f_% Bo-zOc literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/Contents.json new file mode 100644 index 0000000000..4f1e8b2787 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "england@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "england@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/england@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/GBP.imageset/england@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cd9c3075b457ebada7f2219d1cc6051d53370b2d GIT binary patch literal 2412 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 V@96?txat4^002ovPDHLkV1hBPH5~u| literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Contents.json new file mode 100644 index 0000000000..9eda7ab7be --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Israel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Israel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Israel@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ILS.imageset/Israel@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a912bd91c78a62390992f521ed70a0aef0a76a9c GIT binary patch literal 1313 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 ayv6^I=>GA07`5^M0000dw- literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/Contents.json new file mode 100644 index 0000000000..2d160b7eea --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "India@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "India@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/India@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/INR.imageset/India@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0f8ed97f2a2219179768616aa3ad45a686dc9a30 GIT binary patch literal 1284 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 bt`GbLS^sYkLbmxj00000NkvXXu0mjfRRpz# literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/JPY.imageset/japan@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/JPY.imageset/japan@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..3c0ab9615250ab7000925a55420c31a4e3c68316 GIT binary patch literal 1463 zcmV;o1xWgdP)eD+R$+8L{p+$DdsJGY z+%FUgTMG*d&&T=f$O6Fde4`CMs$}$qg{blIH+w~WlqPz^%Rl!}Do{j7g|-AF)2j8~S>{{{B8X*c~$Ce+jMu!mDYUP znFkyk9PILo<^1{5I5|1_F5KJOtCAUCf^w-;TIEm_R>=^-t)+11dxH!S*!GnWqhB(l z_z781g$yam5WqY@j`GkIF(X?{0AWl3VN3vFOaNg_0AWl3VN3vF=4lEE4w~+u=Gkj< z?JC7zU!`eeDg=O$=bk>JxmT|#C>OLRC|X?0buNTHaw0=4Brhzz@ZU!0-)8G?*2o;hmVvd=qHXh z?x^zyRRVK*PV;GW2`q!AUs<@qdt6c9i<6p0ETX?)E0Oocy;OCj7n0WyJCi$cg6F^HI4#Jl+C_wO5&uA1WsZ>88 zB7j8RKa8L`Ljq_DKW%2o1ClHHR;p$y1SL!Q1W1I|31m89g&u&lWC>(EfEPxRYkF3u zBo}DJ($MI~?@0@ijX_L+_y;`#U<->Bavq>)-_A@50OModjx_X8Rq&Ngn%*T&zz;s$y=$b#Xuwfas}3*c!#qQpmt_1iwXn=z-4Ii?7QJ))E? zSk{DxI3x4=f}7%=0)uxmwE|og>^Wg!OaNg_0AWl3VN3vFOaNg_0AWl3VIV+*3@I8W zfGqVej^h_(h=7W$`0MF)GDL9YaQPqEhjnKd)FKW~Pft-^&-#JsJwB>r^aX<~jH!^;k90ka394`N%Wb~V?_^c@ zJZ?S>Q#zv>-ZQoUouC#m%Hg6SYpW<|g)YA+$PSUNKj+Z=7Dh)0+nrvH%4byvbNJ_n R_TT^j002ovPDHLkV1lF=m-_$! literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Contents.json new file mode 100644 index 0000000000..f8ba224a95 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Russia@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Russia@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Russia@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/RUB.imageset/Russia@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..78d6bb8947317ed1fb615745631338bb9f706901 GIT binary patch literal 683 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9E$svykh8Km+7D9BhG z;9H*iI`>$k`AQSPfa^x%5{e~{JVhCYw!{xhDM zOZ?$xvtJYVVO~e3;T*r^A3t@nvY*la(IMrm{^doB`O`wx19!e1_SG#Y@6ey}{Zz?{ zpawBX4UT)46W2^V&COV|_4v22U$-~d_x~*CGWf2)(3`>kR@THPe}X^5?apIo_M<4OA80qn z88JI@t>w^r!BEY&Ho|%l!z2f7w@HuQe|mTEq3T-!M`6B|HFevg%Np&z1RjZ5EBR>q zAw~1w7Y@{X`TK5urNg}nE?Hf}=Dk)L{924pzT|qP#w~gmQLVDvGfGbH3`=IWutapY zdP>hXk9{=}FRHYspWD@bUU^1Mz~XZTPIaRHZ9l1Ii~Dc3{kFsMUX)^t;pw;H=k~R2 zWePc8`DqQewxRBp*8o|0J?9FfiA7x;TbZFuuL(?H^$$yg&{UZMM zPqin%J=J7qXFb}qoA*6bfQA3-^G$c3&(S_I|guU}Ov#YIMoySux)L}SbE-~XQEzgpa@HZ^r=n2wl#TIHK7j1dpN^1po% zCMf0E+);A-(z*%7X=3$A9}9^lv{tk=EYBr~_&{|qzZi`Dh+5r0y-!o$PMf4$!!>A3e|vDTK7 zy;B3Hyh|^C_2Z`Ssn*yFX}>esZ>(|;w>j>#^W-jt*A2M~W4_+=|9zYB`Sa(#dmqlS zkNea;$-n?0(q+{olnVY+I&0>ue9F9xoFMVjAz4n!bNrdZu+VHW)G(urVBCI3U3w!OW1%kif&x0~QRg{dJQ2;09(439PD#7Tj>? z{2_itnKCrnQ1pvA=(GqKGpOkEazB_Z;Fci!U{aevhy5kKf>OmP8WRp}t=%hkp803@ z-R9g)GVT{mz;j1!*Uwz{5f2x1euGWViI`^LI z>Em6Sr@p<%GNG)|JIm?x)5)`}SD0^-XTQ&_RbqeR>dXs85xKXc9@{Z9F411}#4&V- zPOOb~-KCYgR@epHj(*>^tNA>y?F>boX;(j${(o`u&d;)vswJKUSwOxo>e&`sCG%Enj50-(=1 zs%K@nW|*XlZ>if}UTA&vq4B5l_osbblp8JoE9i%AjpXdlzlDDM+R}RdjEsZ*|3|*A z`6b@_CvIKx-$moQ{S=G4bF3#G`M+(E_v>FN6_u82?OBZ+oI4f6PXKc!gQu&X%Q~lo FCIFkAw5tFB literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Contents.json new file mode 100644 index 0000000000..fbf3a17c3c --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Singapore@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Singapore@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Singapore@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/SGD.imageset/Singapore@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..61d244fe93ecb98731de2b19e6047ed94c252330 GIT binary patch literal 1269 zcmV~~0XIwb$S zLxo1DI#tU!`!K$QomyI1<+EFPz9T$!lDZ3LD0t^>Qd8CVdWoGEt$Q@_+aDwzJ*L7F z%FEHvI1*ub<$pfZ`aJ`O{R`{VW#^N4+keu;FU{d_JWZSS{do)vPe;MC1bFRLI%r&> zkdG1K;bWTo@n+xf$8!Nk4umQovo!5t_%}R`g?c|rn*b*^zP7%7L=Eyq@a9Phd6R61 zX9^cBN-W?Yd3(!h!_FKNfD>Rp0V0q${FS@;m(Gy?eV!-T=@R?pRej9LJA)v<2-WPjoQ#k> z%}~;&D3dK~PLPH}(YPN)>>^|&tiYH&nLwmNo@CiTDMbY-8l}b?ry5x|#G!wz_G3tR zw~tST;C!%nj)LA4o5~ZqO_ui`9Np(i(|z|Gb(a@)8?9zvIhs%K`oq9c;SGBvaP~I) z0yvQMCXwXCUMF5-z)>dJWYMb}Xu(l>6^mJ<$&~DOv&=Q!yi zUSF>$airkQ4>f^5FZ0-8K7fcwI*g?Guv8Ycod5j0K& zaw2G)2;@Z2I1$K+pn(W28e=MzN=t@e_z#UQJJ?Af#5RpDzhWnS-`}L8Uy_a;{MV;V zeVm({YX?EFM&ri@@&QibU&!w6?p|kQKBMuVIW;vE|2Q-*kux(hmpDmo(1@dy+NxHo zsmM?D2`of|jn+6>wrKQdvu~HDr>9rhzf=wswkP)X_Evd#e83N$CK}p*9nfNjcR0dt fbNFwX&PO~2E4RVK3Qe6F+#{qInq>8d>u_9=7^LdHy>9?D)*4v z_%KJ5D?)|!Avd8Y)JK2B_lM`>^>{x2fmfWRg)s_=LjnMRGNDnd57+$=H#qO_;w15V z5WX}=e*hrp{RTu$*K|9KAb)FPGEn|nV)0NQUL+?RC)j==RFvy3c#^En5qVyi2artb39m zY|qfp>R|tRq``e=xZ$oHB5{>X$>KbY>6T5>Ky(?|+8ou%;fr1@!tLMsq6!ZdU<{6E zfTB4JMNJGfY5g_>>#4y@+-;HV%B;T`LR<_eg>UY{rf1&xvr83hYwnHs*;SDt!7H8S zw_o!2J6T3HaKfz0%#5e|ja{R#mNB*lYmdXLijABkex#H4RKlSxamO3daLnB{pdigwnMz@c@yDq@H#sqqcP~D@HsQP zw7)jLSKne|_IyP$l=&Pano6qk^l0H~pX|#%pb@wz58VVw+Z{y$vA-zXqZf}RuxKPT zX-xan)IcDLpKStG5*dvK%0jp^FwytU6^7nQ7W)t}FZ{s~QFJl8T8H%PGglF>n1|or zW&CRa_Dk-+S8{B zhKH_i-gz6^C3_2xzX+EcO`KeDa3pKrz0s{zlswt?B8Z|FIWmSx4HX=!|I>F>|HvEN zJ2-DI1n)2Jl=R_AFskt`c+j7g6}Hrygf8pBPoNwN9?R1V4HPaXb0Da{vkxu{%4M3K zKBv0~4v24z-74ubx(PX1#3?uUgQXoBPI1`%x!k$Mv*5&dPyp+=H$m&(Z;O1Qky~{S zkw=2}%52|HgBKfRD~DcMsl*Vx7G~wtRsy)LF2dDMg7-_RCO@vci*xHS2-qqUw-JZ1 z6sDF-=4SDI<#4;M>`Ao>H8<73hiB?Nc6^@Xy9nkphMunCQUl6uvB0S4KHJg7fmSWB!_6ZDCAWUA>D?kq}+o3Cn zeA6~?xqURlItSQjp41hqBUX=gj5$=43To^3swJx@8t&~{tdZ>}pb|5jyg>FLe=OQH~12 zG3_<#u`WVSQs0j)m>s<-OjUE_x+$)igjUrE8LD%&dtq0)%fw>7v zgj0P1Y&+=xB^Y;HCMudz0%E!I3kZx6mFMI%#Fc=-4=T|B5e8r8nl zjQCoAu{&W=8r}+}w`3JC4912%w*%Q@)2Dj2d7av0v81;MPt-y_C&E#k zQwv1J=4IvPwj>~Pp>(zH-V6rAb^F1kKep<8rd}6P--GGq?9`f=l-pf5zMdbdd)FA~ zoyGHY$xsK>Sa4ueuk_ZVL3NvG3=4<_7+-?#(HmA)sMB(mp5^iJ7M?Hh*% Xr~h;6L~!8F;SmBRR0~Qu*^T)hqJvVr literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/Contents.json new file mode 100644 index 0000000000..62dab88db6 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "usa@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "usa@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/usa@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/USD.imageset/usa@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4612b05d02df6843a070b4a6f43736d161caa427 GIT binary patch literal 1891 zcmV-p2b}ncP)r|6QST)GE6=Y7(vxjLR2&JN%7f;ico-7uBaAQBQOr*(X7DO_3LKXo;8FB zQ`Uc0dudtRO7IzPHoUn%KC5>8o=cam(80r(O#@f1c$&YkpWgkT!_;3hbDR)BTYDFE zCNp|}86UfWPqOn$hFUImP$rYrY4c*0w4{C#wOmNj$y5J|KCQHrv`5F#5CVSdKySmA zrM{h?H_1-j1fcd~D}ras9}5ICnI39ObeXuTr&I_5$QPEV2$fN&JV1BDQyCd0uHcbE zgAmaQfRv&r(?^aRnZS*%0Zc1t?&wGddDBN?b+JmB?jF91ou;Q?6@P7R;}b}WX5^6* zw(>|Cw8cdPRaHH}uhVfOd;q+?)zf2@HgBw@&2QD%p0KH*R;agJNeTD~!L!lK16$wr z&TP?d<#7qq(&_YCd=MIt3w35-l@1aXfBLv`u(c< zr$j3#t|ntX%4K-s9wBSxiYgHSVBZo@VT7$RE`Y|}XH4Ec9}hy^>%8BI2mYh>xp6`x zB#-aN&-C!oACo8n6J>j-F zD05is#l|jcZjaDqoe=r}r+zV^`{WtoOfVl(ic?`DUkWyC>@!Y8W`43yUMs_+^72TU zmB&Q{efcN|SDPAYgqnWw)kzZ#2}>Qf9sgL`q(8wzQgsUV^W82zOHX3XiNsiUF!Gp;qllF)JKO&x&$L@Qhv*<=) zGC>nqY<{CgMSudP!X}uiLD)5l6sO8=plZlb#?q>}W2w;S*9Ty7oemByM+?}TAb?Pp z&(ZZqb14t7?+8g?mEPO>ysfeWpz@!5RA-9$k_S~E%*6`yZ9+8|E{bYUM_vIGIt;o6 zn+e=YHP|0dJ|F@>C=za&fGH7z(}H^M{h@{L1l``v!OJeGpD65p*LQ!KCJP>TdQ^i( z9{7*NoJZ~j7*hvGJX&}>^;H($30g8iP1rG3)Cf#MdUX3rYl60SUyG?1&a)y^ z%0C4hwZqEO`|J$5>2@ZVOH6XNxoYjUno621U?fdOgWDCJk;hyON}5wO=vF3J5}C00 zLwS?U_VK2Qh8-IuGJb!F*y6$}q8~sav;39G)RnrSZ*f_9P(;aRNuGuCCvZpDt#6r0 z8c9oizzZnn@YIT0^9)FPxGm;EgIjt*&;t9F~O*yf)%>?qxH#3Y%Q6Z{61i&*GOS ziM>4;=*i==9N9(UWk_U3JW_eiY5Z@TJ^91yW zAit+55}|yB50LK%jsAF?c7$a=Osg2+b0hXTVKN&>S>{3_l*wd@VoS^|DCBVr3xGTh z-$P%2OJ0VrHH1QkVDO5O;GDK3DRyfGb|>}}W*S2EoP z=m7=`JhGJS{LFrAPC{F>EKaJjn`rRQ2fK_E*Z0lrkog#`{9`R-NF6}S- zH+{qm^G8DbWX5a!XPljQF-}v2QGvu(cEq4`GK?)=DqF@389)Y%(n$s#WG7#^P{<-3O|2oP-=^i`fFS~mlxuIdvTt}I?)s+d7wuhP`_4U=#H&%wrsr`}VR9jO;?K_u=*D|U<8>a1B zmrw&Ar=_`;D@`tkV=&T&bqkeO73SEs^-iiDH-gGgMMji6dZiJ9)?dKwq~1&ax$n}o z2$a>`{kC+}fx#5@Cx*oH!D~tJT1M}sK}x1ZssG%NkWZ!3Qn}MzS7;?S0yy>R73G{~ z&R!MI;i~$t3{5z0M880z4=7JIFNshn)HU+b@0(`Lnw7{uFd+yd;KJv_?ck5a8KzP! zFptAfD#ZfxxZQX-218{(lA#>W978r%!=h^1_v}h4ViKdHqfJ#+Rk^@C!3ANp!xa!U z|1j$xxM5x0gxBVAtFo*v#5|rq9s+KDV8$`XrMMCD$HQ3pfm!w0d_pu73hmDSMa~7m z^%#bHwS!;>-wYQ4pWb_EfV$6Jog{}~TU!$mvd2%n!QD!~R8f#yw)8d;NHNaQW4*R> z!quGNav0C=7>3b4GBR?UyP`N==dJ)|1dpiRloGCiMDRl}g#l!ApLwWGR-s9&fmk2cN{)XgElTA$=?qn zVm!OC%sE9MPpako1~)*AUj;Ed7eTmrRmXGu*%tCSJ_y1&xDgIkR#vu~F<^sL06{XD z-qlCpSU1p&9$!Hu|`6S2cw0_Vf7k5JjA%j5^xSZ0e6Yuyt>kodmyw(#2bqTYxx!FKkCE{CG6kD+!tHePdF|$Wj3<8k z4|R)i@?!`~yh)+GFOg4(P-U<&z@tFSdIUia3fs=JP8G;Xp)dr}Z9LP(+Fc4Gv6?Z* ziCTXv%UorsGU2I=_rX}B(=w+|hy)60D^7Rq-;JEL6j5SC%4)v2evgwB z+`@``=2P24jae7L1BWcps;&7nEor({1jwP`8$u?X9-AbGQUu0Z@zwd_wM@>ObK^Je zpxbM!_=+cOo7{oVu@PDw_%Hd1pc^5$1^8a9K2V!c)nu>?-PX1wyIka}Bb6LV5ik<` z`0VPWS+G-69%m*>7Ir;cvnh{E*J)1lpncMmcSLFcG{_Nb5h(4N z@=xtrA%Y|t)9w9!^bpb55T${^aOHEr-9!5=#2Xen74Z?PfZ<*Y5Hs!J8Oj`QFZa>@N>N5IyONjhLL8~D6T&Ge& zL2^9cI@SK&js<*J3$ovuXaxb+&B|!IC{Npiz>I+FW=^*&EkEMA6!FZ{&9r>!Ji7nB zFVWSv|1Ta^P-1`_R!?}Ku_7x)pyvPZj-^z$U=Gc@?Ng$pEh|M}ti^mBlq68vxRS8< z`F<=#xVi%10B}UH5%!5)Gx{= zeNOJC{gGwj3Ys)$I84SZJ}<`MOvTE>Oo~tem6d|A4&V38N>QSQ&wuhqr=*Ed%Xmf& z5Nr?p>WnlOK!%Ip3{U~>IP&@=8GN=wzgUx-bN`_;6XH=x6yx9~{xTkLvw=`vhZm*d zzg`wfKlN(AGAqT|48>zSjHOD%%sH{WMKvcr&mZ_PG-fcLoBc?|j?x7o;36xv^YKuu zsMkBJ)3e(P2Sg3W4g_2$2D$Iwy5qR(_GqyqU51LyQ)0=PnxK5^_H^^Cx5kN?r|s$3YQC7C{Z8A{@i4ciW9(AIbs}bN6^Bc3Y7=66x*g~VU*z#)(6J|cUCb%! z{zk$7)b9(FiC7_3NHVETw*H4Vy)oGUpyfF~L%)RLQs?KcZcb$7ln1j5dJBXajhR zHh{-y19%L}w0&1ELp>zO2LDGI@6ayDW3&N0MjOCmv;jOu8^B|N>5Z+V@eW;%_89Gg zJVqP9W3&N0MjOCmv;jOO7|_KyPhrN|jd~gCA=(9b3=A+#8m}1E2JjMt5-`AjNaGCw zTmdYTAdN>DukkB@b&|#_;z0`DyfC`!sbQlmP*nE@E_uc>!=G4wS6uw>XEK>Qz!>`; zX=ak=!r^e6$O8<+&~9jkDK9TSh@Zj$vuDqa^D7`uni&DQuBfOGw?5Bh!ee7&dr31R za09fN&vORARglSK4wB|01vhZZzoqSjFJKrN8j6HMp&l+2CC#+M&-?^eeiQ$ht3FKn z28@xBk!awbXM5V5=4D-5AGduah1?vH6 zIa&zvH=tNVnh%Ro`M~x|c#PGXq7)eG;!;u46b??{OuCu9(wR_+*fwO?E6*pWBHhFb zc6xPGCmY+@`3BGp%Pa^aO?=TYK$~$7{$4^_OcT%#@&e*NH#zl?fk8{2eA&) zS>We?M**YLt>R5S)EBWC>%JKyaVvC&JF-UjhloVkYdd->u0000 literal 0 HcmV?d00001 diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/Contents.json new file mode 100644 index 0000000000..54a2332838 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "South Africa@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "South Africa@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/South Africa@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Currencies/ZAR.imageset/South Africa@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d998f10848e0c53022eb58bf429dfa7d050c75be GIT binary patch literal 1462 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 CoinService? { @@ -48,7 +47,7 @@ class EvmCoinServiceFactory { } func coinService(token: Token) -> CoinService { - CoinService(token: token, currencyKit: currencyKit, marketKit: marketKit) + CoinService(token: token, currencyManager: currencyManager, marketKit: marketKit) } } diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Fiat/FiatService.swift b/UnstoppableWallet/UnstoppableWallet/Core/Fiat/FiatService.swift index ec2b1c9dcc..c650a1bfe6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Core/Fiat/FiatService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Core/Fiat/FiatService.swift @@ -1,6 +1,5 @@ import Foundation import Combine -import CurrencyKit import RxSwift import RxRelay import MarketKit @@ -11,7 +10,7 @@ class FiatService { private var queue = DispatchQueue(label: "\(AppConfig.label).fiat-service", qos: .userInitiated) private let switchService: AmountTypeSwitchService - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let marketKit: MarketKit.Kit private var coinValueKind: CoinValue.Kind? @@ -47,14 +46,14 @@ class FiatService { private var toggleAvailableRelay = BehaviorRelay(value: false) var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var coinAmountLocked = false - init(switchService: AmountTypeSwitchService, currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit) { + init(switchService: AmountTypeSwitchService, currencyManager: CurrencyManager, marketKit: MarketKit.Kit) { self.switchService = switchService - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.marketKit = marketKit subscribe(disposeBag, switchService.amountTypeObservable) { [weak self] in self?.sync(amountType: $0) } diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Managers/CurrencyManager.swift b/UnstoppableWallet/UnstoppableWallet/Core/Managers/CurrencyManager.swift new file mode 100644 index 0000000000..8c09f394e0 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Core/Managers/CurrencyManager.swift @@ -0,0 +1,61 @@ +import Combine +import StorageKit + +public class CurrencyManager { + private static let supportedCurrencies = [ + Currency(code: "ARS", symbol: "$", decimal: 2), + Currency(code: "AUD", symbol: "A$", decimal: 2), + Currency(code: "BRL", symbol: "R$", decimal: 2), + Currency(code: "CAD", symbol: "C$", decimal: 2), + Currency(code: "CHF", symbol: "₣", decimal: 2), + Currency(code: "CNY", symbol: "¥", decimal: 2), + Currency(code: "EUR", symbol: "€", decimal: 2), + Currency(code: "GBP", symbol: "£", decimal: 2), + Currency(code: "HKD", symbol: "HK$", decimal: 2), + Currency(code: "HUF", symbol: "Ft", decimal: 2), + Currency(code: "ILS", symbol: "₪", decimal: 2), + Currency(code: "INR", symbol: "₹", decimal: 2), + Currency(code: "JPY", symbol: "¥", decimal: 2), + Currency(code: "NOK", symbol: "kr", decimal: 2), + Currency(code: "PHP", symbol: "₱", decimal: 2), + Currency(code: "RON", symbol: "RON", decimal: 2), + Currency(code: "RUB", symbol: "₽", decimal: 2), + Currency(code: "SGD", symbol: "S$", decimal: 2), + Currency(code: "USD", symbol: "$", decimal: 2), + Currency(code: "ZAR", symbol: "R", decimal: 2), + + Currency(code: "BTC", symbol: "₿", decimal: 8), + Currency(code: "ETH", symbol: "Ξ", decimal: 8), + Currency(code: "BNB", symbol: "BNB", decimal: 8), + ] + + private let keyBaseCurrencyCode = "base_currency_code" + + var currencies: [Currency] { Self.supportedCurrencies } + + private let localStorage: ILocalStorage + private let subject = PassthroughSubject() + + init(localStorage: ILocalStorage) { + self.localStorage = localStorage + } + + var baseCurrency: Currency { + get { + if let storedCode: String = localStorage.value(for: keyBaseCurrencyCode), let currency = currencies.first(where: { $0.code == storedCode }) { + return currency + } + + return currencies.first(where: { $0.code == "USD" }) ?? currencies[0] + } + set { + localStorage.set(value: newValue.code, for: keyBaseCurrencyCode) + subject.send(newValue) + } + } + + var baseCurrencyUpdatedPublisher: AnyPublisher { + subject.eraseToAnyPublisher() + } + +} diff --git a/UnstoppableWallet/UnstoppableWallet/Extensions/CurrencyValue.swift b/UnstoppableWallet/UnstoppableWallet/Extensions/CurrencyValue.swift deleted file mode 100644 index 2147021e4b..0000000000 --- a/UnstoppableWallet/UnstoppableWallet/Extensions/CurrencyValue.swift +++ /dev/null @@ -1,9 +0,0 @@ -import CurrencyKit - -extension CurrencyValue { - - var formattedFull: String? { - ValueFormatter.instance.formatFull(currencyValue: self) - } - -} diff --git a/UnstoppableWallet/UnstoppableWallet/Models/AmountData.swift b/UnstoppableWallet/UnstoppableWallet/Models/AmountData.swift index 6dfaeac817..6f18965527 100644 --- a/UnstoppableWallet/UnstoppableWallet/Models/AmountData.swift +++ b/UnstoppableWallet/UnstoppableWallet/Models/AmountData.swift @@ -1,6 +1,5 @@ import UIKit import RxSwift -import CurrencyKit import HsToolKit import MarketKit diff --git a/UnstoppableWallet/UnstoppableWallet/Models/Currency.swift b/UnstoppableWallet/UnstoppableWallet/Models/Currency.swift new file mode 100644 index 0000000000..9b6776957d --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Models/Currency.swift @@ -0,0 +1,11 @@ +public struct Currency { + public let code: String + public let symbol: String + public let decimal: Int +} + +extension Currency: Equatable { + public static func == (lhs: Currency, rhs: Currency) -> Bool { + lhs.code == rhs.code + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Models/CurrencyValue.swift b/UnstoppableWallet/UnstoppableWallet/Models/CurrencyValue.swift new file mode 100644 index 0000000000..7b593b63c4 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Models/CurrencyValue.swift @@ -0,0 +1,23 @@ +import Foundation + +public struct CurrencyValue { + public let currency: Currency + public let value: Decimal + + public init(currency: Currency, value: Decimal) { + self.currency = currency + self.value = value + } +} + +extension CurrencyValue: Equatable { + public static func == (lhs: CurrencyValue, rhs: CurrencyValue) -> Bool { + lhs.currency == rhs.currency && lhs.value == rhs.value + } +} + +extension CurrencyValue { + var formattedFull: String? { + ValueFormatter.instance.formatFull(currencyValue: self) + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Backup/ICloud/AppBackupProvider.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Backup/ICloud/AppBackupProvider.swift index 6d732c9bab..cc71a1a9b0 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Backup/ICloud/AppBackupProvider.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Backup/ICloud/AppBackupProvider.swift @@ -1,4 +1,3 @@ -import CurrencyKit import Foundation import LanguageKit import MarketKit @@ -17,7 +16,7 @@ class AppBackupProvider { private let chartRepository: ChartIndicatorsRepository private let localStorage: LocalStorage private let languageManager: LanguageManager - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let themeManager: ThemeManager private let launchScreenManager: LaunchScreenManager private let appIconManager: AppIconManager @@ -36,7 +35,7 @@ class AppBackupProvider { chartRepository: ChartIndicatorsRepository, localStorage: LocalStorage, languageManager: LanguageManager, - currencyKit: CurrencyKit.Kit, + currencyManager: CurrencyManager, themeManager: ThemeManager, launchScreenManager: LaunchScreenManager, appIconManager: AppIconManager, @@ -55,7 +54,7 @@ class AppBackupProvider { self.chartRepository = chartRepository self.localStorage = localStorage self.languageManager = languageManager - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.themeManager = themeManager self.launchScreenManager = launchScreenManager self.appIconManager = appIconManager @@ -98,7 +97,7 @@ class AppBackupProvider { chartIndicators: chartRepository.backup, indicatorsShown: localStorage.indicatorsShown, currentLanguage: languageManager.currentLanguage, - baseCurrency: currencyKit.baseCurrency.code, + baseCurrency: currencyManager.baseCurrency.code, mode: themeManager.themeMode, showMarketTab: launchScreenManager.showMarket, launchScreen: launchScreenManager.launchScreen, @@ -198,8 +197,8 @@ extension AppBackupProvider { chartRepository.restore(backup: raw.settings.chartIndicators) localStorage.restore(backup: raw.settings) languageManager.currentLanguage = raw.settings.currentLanguage - if let currency = currencyKit.currencies.first(where: { $0.code == raw.settings.baseCurrency }) { - currencyKit.baseCurrency = currency + if let currency = currencyManager.currencies.first(where: { $0.code == raw.settings.baseCurrency }) { + currencyManager.baseCurrency = currency } themeManager.themeMode = raw.settings.mode diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexAmountInputViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexAmountInputViewModel.swift index f4f59ac6d3..7be957e9da 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexAmountInputViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexAmountInputViewModel.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxCocoa -import CurrencyKit import MarketKit protocol ICexAmountInputService: IAmountInputService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexCoinService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexCoinService.swift index e8276d3c41..829b599b7c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexCoinService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexCoinService.swift @@ -1,17 +1,16 @@ import Foundation -import CurrencyKit import BigInt import MarketKit import HsExtensions class CexCoinService { let cexAsset: CexAsset - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let marketKit: MarketKit.Kit - init(cexAsset: CexAsset, currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit) { + init(cexAsset: CexAsset, currencyManager: CurrencyManager, marketKit: MarketKit.Kit) { self.cexAsset = cexAsset - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.marketKit = marketKit } @@ -24,7 +23,7 @@ extension CexCoinService: ICoinService { return nil } - let baseCurrency = currencyKit.baseCurrency + let baseCurrency = currencyManager.baseCurrency return marketKit.coinPrice(coinUid: coin.uid, currencyCode: baseCurrency.code).map { coinPrice in CurrencyValue(currency: baseCurrency, value: coinPrice.value) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawModule.swift index 75312aff1f..82f002681f 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawModule.swift @@ -20,11 +20,11 @@ struct CexWithdrawModule { let service = CexWithdrawService(cexAsset: cexAsset, addressService: addressService, selectedNetwork: defaultNetwork) let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) - let coinService = CexCoinService(cexAsset: cexAsset, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CexCoinService(cexAsset: cexAsset, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let availableBalanceViewModel = SendAvailableBalanceViewModel(service: service, coinService: coinService, switchService: switchService) let amountViewModel = CexAmountInputViewModel( diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawViewModel.swift index add8b81e2c..df12315f68 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdraw/CexWithdrawViewModel.swift @@ -3,7 +3,6 @@ import RxSwift import RxCocoa import HsExtensions import Combine -import CurrencyKit import BigInt class CexWithdrawViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdrawConfirm/CexWithdrawConfirmModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdrawConfirm/CexWithdrawConfirmModule.swift index 31639d8dab..3a9f1f1ad9 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdrawConfirm/CexWithdrawConfirmModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Cex/CexWithdrawConfirm/CexWithdrawConfirmModule.swift @@ -19,7 +19,7 @@ struct CexWithdrawConfirmModule { let handler = cexAccount.withdrawHandler let service = CexWithdrawConfirmService(sendData: sendData, handler: handler) - let coinService = CexCoinService(cexAsset: sendData.cexAsset, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CexCoinService(cexAsset: sendData.cexAsset, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let viewModel = CexWithdrawConfirmViewModel(service: service, coinService: coinService, contactLabelService: contactLabelService) return CexWithdrawConfirmViewController(viewModel: viewModel, handler: handler) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsModule.swift index f22656c8cf..457fe6c3f6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsModule.swift @@ -12,12 +12,12 @@ struct CoinAnalyticsModule { let service = CoinAnalyticsService( fullCoin: fullCoin, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, subscriptionManager: App.shared.subscriptionManager ) let technicalIndicatorService = TechnicalIndicatorService( coinUid: fullCoin.coin.uid, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) let coinIndicatorViewItemFactory = CoinIndicatorViewItemFactory() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsService.swift index ed31cd9cc0..6012a42443 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/CoinAnalyticsService.swift @@ -1,24 +1,23 @@ import Combine import EvmKit import MarketKit -import CurrencyKit import HsToolKit import HsExtensions class CoinAnalyticsService { private let fullCoin: FullCoin private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let subscriptionManager: SubscriptionManager private var tasks = Set() private var cancellables = Set() @PostPublished private(set) var state: State = .loading - init(fullCoin: FullCoin, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, subscriptionManager: SubscriptionManager) { + init(fullCoin: FullCoin, marketKit: MarketKit.Kit, currencyManager: CurrencyManager, subscriptionManager: SubscriptionManager) { self.fullCoin = fullCoin self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.subscriptionManager = subscriptionManager subscriptionManager.$isAuthenticated @@ -46,7 +45,7 @@ class CoinAnalyticsService { extension CoinAnalyticsService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var coin: Coin { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/TechnicalIndicators/TechnicalIndicatorService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/TechnicalIndicators/TechnicalIndicatorService.swift index f6e5770caa..0fb1291b9c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/TechnicalIndicators/TechnicalIndicatorService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Analytics/TechnicalIndicators/TechnicalIndicatorService.swift @@ -1,7 +1,6 @@ import Combine import Foundation import Chart -import CurrencyKit import HsExtensions import MarketKit @@ -15,7 +14,7 @@ class TechnicalIndicatorService { private var tasks = Set() private let coinUid: String - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let marketKit: MarketKit.Kit let allPeriods: [HsPointTimePeriod] = [.hour1, .hour4, .day1, .week1] @@ -27,16 +26,16 @@ class TechnicalIndicatorService { @PostPublished private(set) var state: DataStatus<[SectionItem]> = .loading - init(coinUid: String, currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit) { + init(coinUid: String, currencyManager: CurrencyManager, marketKit: MarketKit.Kit) { self.coinUid = coinUid - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.marketKit = marketKit fetch() } func fetch() { - let currency = currencyKit.baseCurrency + let currency = currencyManager.baseCurrency tasks.forEach { task in task.cancel() } tasks = Set() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/ChartModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/ChartModule.swift index 3813f5e17e..dfdd0e8c39 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/ChartModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/ChartModule.swift @@ -1,7 +1,6 @@ import Foundation import UIKit import RxCocoa -import CurrencyKit import Chart struct ChartModule { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartService.swift index c6bb29e53d..fb906e3ba3 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartService.swift @@ -4,7 +4,6 @@ import RxSwift import RxCocoa import Chart import MarketKit -import CurrencyKit import HsExtensions protocol IChartPointFetcher { @@ -18,7 +17,7 @@ class CoinChartService { private let marketKit: MarketKit.Kit private let localStorage: LocalStorage - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let indicatorRepository: IChartIndicatorsRepository private let coinUid: String @@ -65,9 +64,9 @@ class CoinChartService { private var coinPrice: CoinPrice? private var chartPointsMap = [HsPeriodType: ChartPointsItem]() - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, localStorage: LocalStorage, indicatorRepository: IChartIndicatorsRepository, coinUid: String) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, localStorage: LocalStorage, indicatorRepository: IChartIndicatorsRepository, coinUid: String) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.localStorage = localStorage self.indicatorRepository = indicatorRepository self.coinUid = coinUid @@ -149,7 +148,7 @@ extension CoinChartService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var validIntervals: [HsTimePeriod] { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartViewModel.swift index 5692f14032..3d0587a45e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChart/CoinChartViewModel.swift @@ -4,7 +4,6 @@ import RxRelay import RxCocoa import MarketKit import Chart -import CurrencyKit import HUD import Combine diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChartFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChartFactory.swift index 7f4f4b129b..46435e7ccb 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChartFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinChartFactory.swift @@ -1,7 +1,6 @@ import Foundation import UIKit import Chart -import CurrencyKit import LanguageKit import MarketKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsModule.swift index 605d77b422..2a2733b64a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsModule.swift @@ -3,7 +3,7 @@ import UIKit struct CoinInvestorsModule { static func viewController(coinUid: String) -> UIViewController { - let service = CoinInvestorsService(coinUid: coinUid, marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let service = CoinInvestorsService(coinUid: coinUid, marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let viewModel = CoinInvestorsViewModel(service: service) return CoinInvestorsViewController(viewModel: viewModel, urlManager: UrlManager(inApp: true)) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsService.swift index 2a81b1ee83..b9b199171d 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinInvestors/CoinInvestorsService.swift @@ -1,21 +1,20 @@ import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class CoinInvestorsService { private let coinUid: String private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var tasks = Set() @PostPublished private(set) var state: DataStatus<[CoinInvestment]> = .loading - init(coinUid: String, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(coinUid: String, marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.coinUid = coinUid self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager sync() } @@ -40,7 +39,7 @@ class CoinInvestorsService { extension CoinInvestorsService { var usdCurrency: Currency { - let currencies = currencyKit.currencies + let currencies = currencyManager.currencies return currencies.first { $0.code == "USD" } ?? currencies[0] } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsModule.swift index d2b7d23358..3d7de8800e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsModule.swift @@ -11,7 +11,7 @@ struct CoinMarketsModule { let service = CoinMarketsService( coin: coin, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit + currencyManager: App.shared.currencyManager ) let viewModel = CoinMarketsViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsService.swift index c285c594dd..e8589d3b1b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinMarkets/CoinMarketsService.swift @@ -1,12 +1,11 @@ import Foundation import MarketKit -import CurrencyKit import HsExtensions class CoinMarketsService: IMarketSingleSortHeaderService { private let coin: Coin private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var tasks = Set() @PostPublished private(set) var state: State = .loading @@ -17,10 +16,10 @@ class CoinMarketsService: IMarketSingleSortHeaderService { } } - init(coin: Coin, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(coin: Coin, marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.coin = coin self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager } private func syncTickers() { @@ -61,7 +60,7 @@ class CoinMarketsService: IMarketSingleSortHeaderService { extension CoinMarketsService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var price: Decimal? { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewModule.swift index c67c3eacf5..912460ea60 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewModule.swift @@ -11,7 +11,7 @@ struct CoinOverviewModule { ) let chartService = CoinChartService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, localStorage: App.shared.localStorage, indicatorRepository: repository, coinUid: coinUid @@ -22,7 +22,7 @@ struct CoinOverviewModule { let viewModel = CoinOverviewViewModelNew( coinUid: coinUid, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, languageManager: LanguageManager.shared, accountManager: App.shared.accountManager, walletManager: App.shared.walletManager @@ -40,7 +40,7 @@ struct CoinOverviewModule { let service = CoinOverviewService( coinUid: coinUid, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, languageManager: LanguageManager.shared, accountManager: App.shared.accountManager, walletManager: App.shared.walletManager @@ -53,7 +53,7 @@ struct CoinOverviewModule { let chartService = CoinChartService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, localStorage: App.shared.localStorage, indicatorRepository: repository, coinUid: coinUid diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewService.swift index de52acd1ee..561bb193e0 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewService.swift @@ -2,7 +2,6 @@ import UIKit import RxSwift import RxCocoa import MarketKit -import CurrencyKit import LanguageKit import HsExtensions @@ -11,7 +10,7 @@ class CoinOverviewService { private let coinUid: String private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let languageManager: LanguageManager private let accountManager: AccountManager private let walletManager: WalletManager @@ -23,10 +22,10 @@ class CoinOverviewService { } } - init(coinUid: String, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, languageManager: LanguageManager, accountManager: AccountManager, walletManager: WalletManager) { + init(coinUid: String, marketKit: MarketKit.Kit, currencyManager: CurrencyManager, languageManager: LanguageManager, accountManager: AccountManager, walletManager: WalletManager) { self.coinUid = coinUid self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.languageManager = languageManager self.accountManager = accountManager self.walletManager = walletManager @@ -114,7 +113,7 @@ extension CoinOverviewService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } func sync() { @@ -122,9 +121,9 @@ extension CoinOverviewService { state = .loading - Task { [weak self, marketKit, coinUid, currencyKit, languageManager] in + Task { [weak self, marketKit, coinUid, currencyManager, languageManager] in do { - let info = try await marketKit.marketInfoOverview(coinUid: coinUid, currencyCode: currencyKit.baseCurrency.code, languageCode: languageManager.currentLanguage) + let info = try await marketKit.marketInfoOverview(coinUid: coinUid, currencyCode: currencyManager.baseCurrency.code, languageCode: languageManager.currentLanguage) self?.sync(info: info) } catch { self?.state = .failed(error) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewView.swift index 210181e12c..be03116e0c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewView.swift @@ -1,4 +1,3 @@ -import CurrencyKit import SDWebImageSwiftUI import SwiftUI diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewItemFactory.swift index 68468ea63c..af7013e8dc 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewItemFactory.swift @@ -1,4 +1,3 @@ -import CurrencyKit import Foundation import MarketKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewModelNew.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewModelNew.swift index fafc1a6fdb..f5232862f1 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewModelNew.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/CoinOverview/CoinOverviewViewModelNew.swift @@ -1,5 +1,4 @@ import Combine -import CurrencyKit import Foundation import HsExtensions import LanguageKit @@ -10,7 +9,7 @@ class CoinOverviewViewModelNew: ObservableObject { private let coinUid: String private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let languageManager: LanguageManager private let accountManager: AccountManager private let walletManager: WalletManager @@ -20,15 +19,15 @@ class CoinOverviewViewModelNew: ObservableObject { @Published private(set) var state: DataStatus = .loading - init(coinUid: String, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, languageManager: LanguageManager, accountManager: AccountManager, walletManager: WalletManager) { + init(coinUid: String, marketKit: MarketKit.Kit, currencyManager: CurrencyManager, languageManager: LanguageManager, accountManager: AccountManager, walletManager: WalletManager) { self.coinUid = coinUid self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.languageManager = languageManager self.accountManager = accountManager self.walletManager = walletManager - currency = currencyKit.baseCurrency + currency = currencyManager.baseCurrency } private func handleSuccess(info: MarketInfoOverview) { @@ -121,9 +120,9 @@ extension CoinOverviewViewModelNew { state = .loading - Task { [weak self, marketKit, coinUid, currencyKit, languageManager] in + Task { [weak self, marketKit, coinUid, currencyManager, languageManager] in do { - let info = try await marketKit.marketInfoOverview(coinUid: coinUid, currencyCode: currencyKit.baseCurrency.code, languageCode: languageManager.currentLanguage) + let info = try await marketKit.marketInfoOverview(coinUid: coinUid, currencyCode: currencyManager.baseCurrency.code, languageCode: languageManager.currentLanguage) self?.handleSuccess(info: info) } catch { self?.handleFailure(error: error) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankModule.swift index 411c85bd05..bc85b742fe 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankModule.swift @@ -7,7 +7,7 @@ struct CoinRankModule { let service = CoinRankService( type: type, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit + currencyManager: App.shared.currencyManager ) let viewModel = CoinRankViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankService.swift index 8ca064f31f..4de3e9038e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankService.swift @@ -1,12 +1,11 @@ import Foundation import MarketKit -import CurrencyKit import HsExtensions class CoinRankService { let type: CoinRankModule.RankType private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var tasks = Set() @PostPublished private(set) var state: State = .loading @@ -25,10 +24,10 @@ class CoinRankService { private var internalItems: [InternalItem]? - init(type: CoinRankModule.RankType, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(type: CoinRankModule.RankType, marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.type = type self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager sync() } @@ -38,9 +37,9 @@ class CoinRankService { state = .loading - Task { [weak self, marketKit, currencyKit, type] in + Task { [weak self, marketKit, currencyManager, type] in do { - let currencyCode = currencyKit.baseCurrency.code + let currencyCode = currencyManager.baseCurrency.code let values: [Value] switch type { @@ -123,7 +122,7 @@ class CoinRankService { extension CoinRankService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankViewModel.swift index 72244f31ec..d877bb9ecd 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Ranks/CoinRankViewModel.swift @@ -4,7 +4,6 @@ import RxSwift import RxRelay import RxCocoa import MarketKit -import CurrencyKit class CoinRankViewModel { private let timePeriods: [HsTimePeriod] = [.day1, .week1, .month1] diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesModule.swift index a8fb58fe6f..b2a77a3bea 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesModule.swift @@ -4,7 +4,7 @@ import MarketKit struct CoinTreasuriesModule { static func viewController(coin: Coin) -> UIViewController { - let service = CoinTreasuriesService(coin: coin, marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let service = CoinTreasuriesService(coin: coin, marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let viewModel = CoinTreasuriesViewModel(service: service) return CoinTreasuriesViewController(viewModel: viewModel) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesService.swift index 798ec400a0..9b3a13e2c5 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Coin/Treasuries/CoinTreasuriesService.swift @@ -1,13 +1,12 @@ import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class CoinTreasuriesService { private let coin: Coin private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var tasks = Set() private var internalState: DataStatus<[CoinTreasury]> = .loading { @@ -39,10 +38,10 @@ class CoinTreasuriesService { } } - init(coin: Coin, marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(coin: Coin, marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.coin = coin self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager syncTreasuries() } @@ -78,9 +77,9 @@ class CoinTreasuriesService { internalState = .loading } - Task { [weak self, marketKit, coin, currencyKit] in + Task { [weak self, marketKit, coin, currencyManager] in do { - let treasuries = try await marketKit.treasuries(coinUid: coin.uid, currencyCode: currencyKit.baseCurrency.code) + let treasuries = try await marketKit.treasuries(coinUid: coin.uid, currencyCode: currencyManager.baseCurrency.code) self?.internalState = .completed(treasuries) } catch { self?.internalState = .failed(error) @@ -113,7 +112,7 @@ extension CoinTreasuriesService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var coinCode: String { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectModule.swift index df16d84417..89bc14c2da 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectModule.swift @@ -14,7 +14,7 @@ struct CoinSelectModule { marketKit: App.shared.marketKit, walletManager: App.shared.walletManager, adapterManager: App.shared.adapterManager, - currencyKit: App.shared.currencyKit + currencyManager: App.shared.currencyManager ) let viewModel = CoinSelectViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectService.swift index 7584112392..5e1f11fb4b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectService.swift @@ -2,14 +2,13 @@ import Foundation import RxSwift import RxRelay import MarketKit -import CurrencyKit class CoinSelectService { private let dex: SwapModule.Dex private let marketKit: MarketKit.Kit private let walletManager: WalletManager private let adapterManager: AdapterManager - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let disposeBag = DisposeBag() private let itemsRelay = PublishRelay<[Item]>() @@ -21,12 +20,12 @@ class CoinSelectService { private var filter: String = "" - init(dex: SwapModule.Dex, marketKit: MarketKit.Kit, walletManager: WalletManager, adapterManager: AdapterManager, currencyKit: CurrencyKit.Kit) { + init(dex: SwapModule.Dex, marketKit: MarketKit.Kit, walletManager: WalletManager, adapterManager: AdapterManager, currencyManager: CurrencyManager) { self.dex = dex self.marketKit = marketKit self.walletManager = walletManager self.adapterManager = adapterManager - self.currencyKit = currencyKit + self.currencyManager = currencyManager syncItems() } @@ -55,7 +54,7 @@ class CoinSelectService { } return balanceCoins.map { token, balance -> Item in - let coinPrice: CoinPrice? = marketKit.coinPrice(coinUid: token.coin.uid, currencyCode: currencyKit.baseCurrency.code) + let coinPrice: CoinPrice? = marketKit.coinPrice(coinUid: token.coin.uid, currencyCode: currencyManager.baseCurrency.code) let rate: Decimal? = coinPrice.flatMap { $0.expired ? nil : $0.value } return Item(token: token, balance: balance, rate: rate) @@ -140,7 +139,7 @@ extension CoinSelectService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } func set(filter: String) { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectViewModel.swift index 70c28b3da4..08c4daef1c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/CoinSelect/CoinSelectViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import MarketKit -import CurrencyKit class CoinSelectViewModel { private let service: CoinSelectService diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/FilteredList/MarketFilteredListService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/FilteredList/MarketFilteredListService.swift index 17dcaebc0c..573a23b5c3 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/FilteredList/MarketFilteredListService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/FilteredList/MarketFilteredListService.swift @@ -2,7 +2,6 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions protocol IMarketFilteredListProvider { @@ -10,7 +9,7 @@ protocol IMarketFilteredListProvider { } class MarketFilteredListService: IMarketMultiSortHeaderService { - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let provider: IMarketFilteredListProvider private var tasks = Set() @@ -22,8 +21,8 @@ class MarketFilteredListService: IMarketMultiSortHeaderService { } } - init(currencyKit: CurrencyKit.Kit, provider: IMarketFilteredListProvider) { - self.currencyKit = currencyKit + init(currencyManager: CurrencyManager, provider: IMarketFilteredListProvider) { + self.currencyManager = currencyManager self.provider = provider syncMarketInfos() @@ -91,7 +90,7 @@ extension MarketFilteredListService: IMarketListDecoratorService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var priceChangeType: MarketModule.PriceChangeType { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchModule.swift index 4e09695bdd..279a9b5188 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchModule.swift @@ -3,7 +3,7 @@ import UIKit class MarketAdvancedSearchModule { static func viewController() -> UIViewController { - let service = MarketAdvancedSearchService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let service = MarketAdvancedSearchService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let viewModel = MarketAdvancedSearchViewModel(service: service) return MarketAdvancedSearchViewController(viewModel: viewModel) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchService.swift index f6ac3e0144..4391b66b6a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchService.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxRelay -import CurrencyKit import MarketKit import HsExtensions @@ -31,7 +30,7 @@ class MarketAdvancedSearchService { private let allTimeDeltaPercent: Decimal = 10 private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var internalState: State = .loading { didSet { @@ -171,14 +170,14 @@ class MarketAdvancedSearchService { } var currencyCode: String { - currencyKit.baseCurrency.code + currencyManager.baseCurrency.code } let allBlockchains: [Blockchain] - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager do { let blockchains = try marketKit.blockchains(uids: blockchainTypes.map { $0.uid }) @@ -195,9 +194,9 @@ class MarketAdvancedSearchService { internalState = .loading - Task { [weak self, marketKit, coinListCount, currencyKit] in + Task { [weak self, marketKit, coinListCount, currencyManager] in do { - let marketInfos = try await marketKit.advancedMarketInfos(top: coinListCount.rawValue, currencyCode: currencyKit.baseCurrency.code) + let marketInfos = try await marketKit.advancedMarketInfos(top: coinListCount.rawValue, currencyCode: currencyManager.baseCurrency.code) self?.internalState = .loaded(marketInfos: marketInfos) } catch { self?.internalState = .failed(error: error) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchViewModel.swift index 184528f539..9f93ef69a5 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearch/MarketAdvancedSearchViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import MarketKit -import CurrencyKit class MarketAdvancedSearchViewModel { private let disposeBag = DisposeBag() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultModule.swift index a0d8e305d9..84588fa30d 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultModule.swift @@ -4,7 +4,7 @@ import MarketKit struct MarketAdvancedSearchResultModule { static func viewController(marketInfos: [MarketInfo], priceChangeType: MarketModule.PriceChangeType) -> UIViewController { - let service = MarketAdvancedSearchResultService(marketInfos: marketInfos, currencyKit: App.shared.currencyKit, priceChangeType: priceChangeType) + let service = MarketAdvancedSearchResultService(marketInfos: marketInfos, currencyManager: App.shared.currencyManager, priceChangeType: priceChangeType) let watchlistToggleService = MarketWatchlistToggleService(coinUidService: service, favoritesManager: App.shared.favoritesManager) let decorator = MarketListMarketFieldDecorator(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultService.swift index 8f82f4d5bb..53edf41b7e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketAdvancedSearchResults/MarketAdvancedSearchResultService.swift @@ -2,14 +2,13 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class MarketAdvancedSearchResultService: IMarketMultiSortHeaderService { typealias Item = MarketInfo private let marketInfos: [MarketInfo] - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager let priceChangeType: MarketModule.PriceChangeType @PostPublished private(set) var state: MarketListServiceState = .loading @@ -20,9 +19,9 @@ class MarketAdvancedSearchResultService: IMarketMultiSortHeaderService { } } - init(marketInfos: [MarketInfo], currencyKit: CurrencyKit.Kit, priceChangeType: MarketModule.PriceChangeType) { + init(marketInfos: [MarketInfo], currencyManager: CurrencyManager, priceChangeType: MarketModule.PriceChangeType) { self.marketInfos = marketInfos - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.priceChangeType = priceChangeType syncState() @@ -64,7 +63,7 @@ extension MarketAdvancedSearchResultService: IMarketListDecoratorService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } func onUpdate(marketFieldIndex: Int) { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryMarketCapFetcher.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryMarketCapFetcher.swift index 03637be8c1..b19fcfc2ff 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryMarketCapFetcher.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryMarketCapFetcher.swift @@ -1,16 +1,15 @@ import Foundation import MarketKit -import CurrencyKit import Chart class MarketCategoryMarketCapFetcher { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let category: String - init(currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit, category: String) { + init(currencyManager: CurrencyManager, marketKit: MarketKit.Kit, category: String) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.category = category } @@ -19,7 +18,7 @@ class MarketCategoryMarketCapFetcher { extension MarketCategoryMarketCapFetcher: IMetricChartFetcher { var valueType: MetricChartModule.ValueType { - .compactCurrencyValue(currencyKit.baseCurrency) + .compactCurrencyValue(currencyManager.baseCurrency) } var intervals: [HsTimePeriod] { @@ -27,7 +26,7 @@ extension MarketCategoryMarketCapFetcher: IMetricChartFetcher { } func fetch(interval: HsTimePeriod) async throws -> MetricChartModule.ItemData { - let points = try await marketKit.coinCategoryMarketCapChart(category: category, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.coinCategoryMarketCapChart(category: category, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) let items = points.map { point -> MetricChartModule.Item in MetricChartModule.Item(value: point.marketCap, timestamp: point.timestamp) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryModule.swift index 7149790034..7c768b372f 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketCategory/MarketCategoryModule.swift @@ -13,10 +13,10 @@ struct MarketCategoryModule { languageManager: LanguageManager.shared ) - let listService = MarketFilteredListService(currencyKit: App.shared.currencyKit, provider: service) + let listService = MarketFilteredListService(currencyManager: App.shared.currencyManager, provider: service) let watchlistToggleService = MarketWatchlistToggleService(coinUidService: listService, favoritesManager: App.shared.favoritesManager) - let marketCapFetcher = MarketCategoryMarketCapFetcher(currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit, category: category.uid) + let marketCapFetcher = MarketCategoryMarketCapFetcher(currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit, category: category.uid) let chartService = MetricChartService(chartFetcher: marketCapFetcher, interval: .day1) let factory = MetricChartFactory(currentLocale: LanguageManager.shared.currentLocale) let chartViewModel = MetricChartViewModel(service: chartService, factory: factory) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/Category/MarketDiscoveryCategoryService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/Category/MarketDiscoveryCategoryService.swift index b86e8fe2ae..12b6a4fd28 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/Category/MarketDiscoveryCategoryService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/Category/MarketDiscoveryCategoryService.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsToolKit import HsExtensions @@ -12,14 +11,14 @@ class MarketDiscoveryCategoryService: IMarketSingleSortHeaderService { private var tasks = Set() private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var categories = [CoinCategory]() @PostPublished private(set) var state: State = .loading public var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } public var timePeriod: HsTimePeriod = MarketDiscoveryCategoryService.allowedTimePeriods[0] { @@ -56,9 +55,9 @@ class MarketDiscoveryCategoryService: IMarketSingleSortHeaderService { return [.topCoins] + items } - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, reachabilityManager: IReachabilityManager) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, reachabilityManager: IReachabilityManager) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager reachabilityManager.reachabilityObservable .observeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated)) @@ -77,9 +76,9 @@ class MarketDiscoveryCategoryService: IMarketSingleSortHeaderService { tasks = Set() - Task { [weak self, marketKit, currencyKit] in + Task { [weak self, marketKit, currencyManager] in do { - let categories = try await marketKit.coinCategories(currencyCode: currencyKit.baseCurrency.code) + let categories = try await marketKit.coinCategories(currencyCode: currencyManager.baseCurrency.code) self?.sync(categories: categories) } catch { self?.sync(error: error) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryFilterService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryFilterService.swift index bd811e86bb..ca09cc0b4c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryFilterService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryFilterService.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import MarketKit -import CurrencyKit class MarketDiscoveryFilterService { private let marketKit: MarketKit.Kit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryModule.swift index b258dbc866..abc7d63a84 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryModule.swift @@ -1,11 +1,10 @@ import UIKit -import CurrencyKit import MarketKit struct MarketDiscoveryModule { static func viewController() -> UIViewController { - let categoryService = MarketDiscoveryCategoryService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, reachabilityManager: App.shared.reachabilityManager) + let categoryService = MarketDiscoveryCategoryService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, reachabilityManager: App.shared.reachabilityManager) let filterService = MarketDiscoveryFilterService(marketKit: App.shared.marketKit, favoritesManager: App.shared.favoritesManager) let headerViewModel = MarketSingleSortHeaderViewModel(service: categoryService, decorator: categoryService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryViewModel.swift index e1f0e3a400..dd96219236 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketDiscovery/MarketDiscoveryViewModel.swift @@ -3,7 +3,6 @@ import Combine import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit class MarketDiscoveryViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobal/MarketGlobalFetcher.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobal/MarketGlobalFetcher.swift index 4eb3128e5f..7f9c519367 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobal/MarketGlobalFetcher.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobal/MarketGlobalFetcher.swift @@ -1,16 +1,15 @@ import Foundation import MarketKit -import CurrencyKit import Chart class MarketGlobalFetcher { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let metricsType: MarketGlobalModule.MetricsType - init(currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit, metricsType: MarketGlobalModule.MetricsType) { + init(currencyManager: CurrencyManager, marketKit: MarketKit.Kit, metricsType: MarketGlobalModule.MetricsType) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.metricsType = metricsType } @@ -19,11 +18,11 @@ class MarketGlobalFetcher { extension MarketGlobalFetcher: IMetricChartFetcher { var valueType: MetricChartModule.ValueType { - .compactCurrencyValue(currencyKit.baseCurrency) + .compactCurrencyValue(currencyManager.baseCurrency) } func fetch(interval: HsTimePeriod) async throws -> MetricChartModule.ItemData { - let points = try await marketKit.globalMarketPoints(currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.globalMarketPoints(currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) var dominancePoints = [Decimal]() let items = points.map { point -> MetricChartModule.Item in diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketGlobalDefiMetricService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketGlobalDefiMetricService.swift index bbd141100c..6a1e4e25f4 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketGlobalDefiMetricService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketGlobalDefiMetricService.swift @@ -2,14 +2,13 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class MarketGlobalDefiMetricService: IMarketSingleSortHeaderService { typealias Item = DefiItem private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let disposeBag = DisposeBag() private var tasks = Set() @@ -23,9 +22,9 @@ class MarketGlobalDefiMetricService: IMarketSingleSortHeaderService { let initialMarketFieldIndex: Int = 1 - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager syncMarketInfos() } @@ -103,7 +102,7 @@ extension MarketGlobalDefiMetricService: IMarketListCoinUidService { extension MarketGlobalDefiMetricService: IMarketListDecoratorService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var priceChangeType: MarketModule.PriceChangeType { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketListDefiDecorator.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketListDefiDecorator.swift index 1477296aca..0169c856f6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketListDefiDecorator.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/DefiCap/MarketListDefiDecorator.swift @@ -1,4 +1,3 @@ -import CurrencyKit import MarketKit class MarketListDefiDecorator { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricModule.swift index ac1cf5cba8..a13cbaddb4 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricModule.swift @@ -20,7 +20,7 @@ struct MarketGlobalMetricModule { private static func globalMetricViewController(type: MarketGlobalModule.MetricsType) -> UIViewController { let service = MarketGlobalMetricService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, metricsType: type ) @@ -33,7 +33,7 @@ struct MarketGlobalMetricModule { let listViewModel = MarketListWatchViewModel(service: service, watchlistToggleService: watchlistToggleService, decorator: decorator) let headerViewModel = MarketSingleSortHeaderViewModel(service: service, decorator: decorator) - let chartFetcher = MarketGlobalFetcher(currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit, metricsType: type) + let chartFetcher = MarketGlobalFetcher(currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit, metricsType: type) let chartService = MetricChartService( chartFetcher: chartFetcher, interval: .day1 @@ -48,7 +48,7 @@ struct MarketGlobalMetricModule { private static func defiCapViewController() -> UIViewController { let service = MarketGlobalDefiMetricService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit + currencyManager: App.shared.currencyManager ) let watchlistToggleService = MarketWatchlistToggleService( @@ -60,7 +60,7 @@ struct MarketGlobalMetricModule { let listViewModel = MarketListWatchViewModel(service: service, watchlistToggleService: watchlistToggleService, decorator: decorator) let headerViewModel = MarketSingleSortHeaderViewModel(service: service, decorator: decorator) - let chartFetcher = MarketGlobalFetcher(currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit, metricsType: .defiCap) + let chartFetcher = MarketGlobalFetcher(currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit, metricsType: .defiCap) let chartService = MetricChartService( chartFetcher: chartFetcher, interval: .day1 @@ -75,7 +75,7 @@ struct MarketGlobalMetricModule { static func tvlInDefiViewController() -> UIViewController { let service = MarketGlobalTvlMetricService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit + currencyManager: App.shared.currencyManager ) let watchlistToggleService = MarketWatchlistToggleService( @@ -87,7 +87,7 @@ struct MarketGlobalMetricModule { let listViewModel = MarketListWatchViewModel(service: service, watchlistToggleService: watchlistToggleService, decorator: decorator) let headerViewModel = MarketTvlSortHeaderViewModel(service: service, decorator: decorator) - let chartFetcher = MarketGlobalTvlFetcher(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, marketGlobalTvlPlatformService: service) + let chartFetcher = MarketGlobalTvlFetcher(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, marketGlobalTvlPlatformService: service) let chartService = MetricChartService( chartFetcher: chartFetcher, interval: .day1 diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricService.swift index 3db4a383ec..4b6ff4e370 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/MarketGlobalMetricService.swift @@ -2,14 +2,13 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class MarketGlobalMetricService: IMarketSingleSortHeaderService { typealias Item = MarketInfo private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let disposeBag = DisposeBag() private var tasks = Set() @@ -24,9 +23,9 @@ class MarketGlobalMetricService: IMarketSingleSortHeaderService { let initialMarketFieldIndex: Int - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, metricsType: MarketGlobalModule.MetricsType) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, metricsType: MarketGlobalModule.MetricsType) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.metricsType = metricsType initialMarketFieldIndex = metricsType.marketField.rawValue @@ -98,7 +97,7 @@ extension MarketGlobalMetricService: IMarketListCoinUidService { extension MarketGlobalMetricService: IMarketListDecoratorService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var priceChangeType: MarketModule.PriceChangeType { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlFetcher.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlFetcher.swift index da8a1c7072..778a0252d4 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlFetcher.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlFetcher.swift @@ -1,19 +1,18 @@ import Foundation import Combine import MarketKit -import CurrencyKit import Chart class MarketGlobalTvlFetcher { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let service: MarketGlobalTvlMetricService private let needUpdateSubject = PassthroughSubject() - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, marketGlobalTvlPlatformService: MarketGlobalTvlMetricService) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, marketGlobalTvlPlatformService: MarketGlobalTvlMetricService) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager service = marketGlobalTvlPlatformService } @@ -22,7 +21,7 @@ class MarketGlobalTvlFetcher { extension MarketGlobalTvlFetcher: IMetricChartFetcher { var valueType: MetricChartModule.ValueType { - .compactCurrencyValue(currencyKit.baseCurrency) + .compactCurrencyValue(currencyManager.baseCurrency) } var needUpdatePublisher: AnyPublisher { @@ -30,7 +29,7 @@ extension MarketGlobalTvlFetcher: IMetricChartFetcher { } func fetch(interval: HsTimePeriod) async throws -> MetricChartModule.ItemData { - let points = try await marketKit.marketInfoGlobalTvl(platform: service.marketPlatformField.chain, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.marketInfoGlobalTvl(platform: service.marketPlatformField.chain, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) let items = points.map { point -> MetricChartModule.Item in MetricChartModule.Item(value: point.value, timestamp: point.timestamp) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlMetricService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlMetricService.swift index 6e27b81588..7d5057bb67 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlMetricService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketGlobalTvlMetricService.swift @@ -1,14 +1,13 @@ import Foundation import Combine import MarketKit -import CurrencyKit import HsExtensions class MarketGlobalTvlMetricService { typealias Item = DefiCoin private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var tasks = Set() private var cancellables = Set() @@ -51,9 +50,9 @@ class MarketGlobalTvlMetricService { } } - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager syncDefiCoins() } @@ -123,7 +122,7 @@ class MarketGlobalTvlMetricService { extension MarketGlobalTvlMetricService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketListTvlDecorator.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketListTvlDecorator.swift index fdda0191d3..96de1a6b08 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketListTvlDecorator.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketGlobalMetric/TvlInDefi/MarketListTvlDecorator.swift @@ -1,5 +1,4 @@ import Foundation -import CurrencyKit import MarketKit class MarketListTvlDecorator { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListMarketFieldDecorator.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListMarketFieldDecorator.swift index b1f6d5a570..ee01428cb5 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListMarketFieldDecorator.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListMarketFieldDecorator.swift @@ -1,4 +1,3 @@ -import CurrencyKit import MarketKit class MarketListMarketFieldDecorator { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListViewModel.swift index 9409706a23..586ca3741d 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListViewModel.swift @@ -2,7 +2,6 @@ import Combine import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit import HsExtensions diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListWatchViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListWatchViewModel.swift index a2bf136130..ec848d748c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListWatchViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketList/MarketListWatchViewModel.swift @@ -1,7 +1,6 @@ import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit protocol IMarketListWatchViewModel: IMarketListViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift index f3ea5b4362..96afd2647b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift @@ -1,7 +1,6 @@ import Foundation import UIKit import ThemeKit -import CurrencyKit import MarketKit import ComponentKit import StorageKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsModule.swift index 0bee52706e..1019c7902d 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsModule.swift @@ -5,7 +5,7 @@ import MarketKit struct MarketNftTopCollectionsModule { static func viewController(timePeriod: HsTimePeriod) -> UIViewController { - let service = MarketNftTopCollectionsService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, timePeriod: timePeriod) + let service = MarketNftTopCollectionsService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, timePeriod: timePeriod) let decorator = MarketListNftCollectionDecorator(service: service) let viewModel = MarketNftTopCollectionsViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsService.swift index a316381a24..19b54fcac8 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketNftTopCollections/MarketNftTopCollectionsService.swift @@ -1,7 +1,6 @@ import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit import HsExtensions @@ -17,7 +16,7 @@ class MarketNftTopCollectionsService { private var tasks = Set() private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var internalState: MarketListServiceState = .loading @@ -26,9 +25,9 @@ class MarketNftTopCollectionsService { var sortType: MarketNftTopCollectionsModule.SortType = .highestVolume { didSet { syncIfPossible() } } var timePeriod: HsTimePeriod { didSet { syncIfPossible() } } - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, timePeriod: HsTimePeriod) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, timePeriod: HsTimePeriod) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.timePeriod = timePeriod sync() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/Category/MarketOverviewCategoryService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/Category/MarketOverviewCategoryService.swift index 97a85dbff6..65d99ab923 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/Category/MarketOverviewCategoryService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/Category/MarketOverviewCategoryService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit class MarketOverviewCategoryService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalService.swift index 049c4d3063..44bbd3590b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit class MarketOverviewGlobalService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalViewModel.swift index abe2cb461c..c3b45c6f5e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/GlobalMarket/MarketOverviewGlobalViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit import Chart diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewModule.swift index 1b6dfc6304..39bdbeb0b7 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewModule.swift @@ -1,7 +1,7 @@ struct MarketOverviewModule { static func viewController(presentDelegate: IPresentDelegate) -> MarketOverviewViewController { - let service = MarketOverviewService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, appManager: App.shared.appManager) + let service = MarketOverviewService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, appManager: App.shared.appManager) let globalService = MarketOverviewGlobalService(baseService: service) let globalViewModel = MarketOverviewGlobalViewModel(service: globalService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewService.swift index 60e674e048..854ba91646 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/MarketOverviewService.swift @@ -2,13 +2,12 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit import HsExtensions class MarketOverviewService { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let appManager: IAppManager private let disposeBag = DisposeBag() private var cancellables = Set() @@ -16,9 +15,9 @@ class MarketOverviewService { @PostPublished private(set) var state: DataStatus = .loading - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, appManager: IAppManager) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, appManager: IAppManager) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.appManager = appManager } @@ -49,11 +48,11 @@ class MarketOverviewService { extension MarketOverviewService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } func load() { - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher .sink { [weak self] _ in self?.syncState() } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsService.swift index 068fe3b147..3b8c2cdef1 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit class MarketOverviewTopCoinsService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsViewModel.swift index 92681d813a..a71b9753ff 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopCoins/MarketOverviewTopCoinsViewModel.swift @@ -1,7 +1,6 @@ import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit class MarketOverviewTopCoinsViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopNftCollections/MarketOverviewNftCollectionsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopNftCollections/MarketOverviewNftCollectionsService.swift index 68ba1aeef9..a35345dfa9 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopNftCollections/MarketOverviewNftCollectionsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopNftCollections/MarketOverviewNftCollectionsService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit class MarketOverviewNftCollectionsService: IMarketListNftTopCollectionDecoratorService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopPlatforms/MarketOverviewTopPlatformsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopPlatforms/MarketOverviewTopPlatformsService.swift index 7e305aa30d..c797aaa819 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopPlatforms/MarketOverviewTopPlatformsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketOverview/TopPlatforms/MarketOverviewTopPlatformsService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit class MarketOverviewTopPlatformsService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopModule.swift index 927ea011df..beb0e2fc3d 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopModule.swift @@ -6,7 +6,7 @@ struct MarketTopModule { static func viewController(marketTop: MarketModule.MarketTop = .top100, sortingField: MarketModule.SortingField = .highestCap, marketField: MarketModule.MarketField = .price) -> UIViewController { let service = MarketTopService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketTop: marketTop, sortingField: sortingField, marketField: marketField diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopService.swift index 4b13d28d77..72d3f2a770 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTop/MarketTopService.swift @@ -2,14 +2,13 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class MarketTopService: IMarketMultiSortHeaderService { typealias Item = MarketInfo private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let disposeBag = DisposeBag() private var tasks = Set() @@ -35,9 +34,9 @@ class MarketTopService: IMarketMultiSortHeaderService { let initialMarketFieldIndex: Int - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, marketTop: MarketModule.MarketTop, sortingField: MarketModule.SortingField, marketField: MarketModule.MarketField) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, marketTop: MarketModule.MarketTop, sortingField: MarketModule.SortingField, marketField: MarketModule.MarketField) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.marketTop = marketTop self.sortingField = sortingField initialMarketFieldIndex = marketField.rawValue @@ -111,7 +110,7 @@ extension MarketTopService: IMarketListCoinUidService { extension MarketTopService: IMarketListDecoratorService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var priceChangeType: MarketModule.PriceChangeType { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketListTopPlatformDecorator.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketListTopPlatformDecorator.swift index 29a2cd4e6f..74a489df80 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketListTopPlatformDecorator.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketListTopPlatformDecorator.swift @@ -1,5 +1,4 @@ import Foundation -import CurrencyKit import MarketKit import ComponentKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsModule.swift index b8c6e81b03..85c29a743a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsModule.swift @@ -5,7 +5,7 @@ import MarketKit struct MarketTopPlatformsModule { static func viewController(timePeriod: HsTimePeriod) -> UIViewController { - let service = MarketTopPlatformsService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, appManager: App.shared.appManager, timePeriod: timePeriod) + let service = MarketTopPlatformsService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, appManager: App.shared.appManager, timePeriod: timePeriod) let decorator = MarketListTopPlatformDecorator(service: service) let viewModel = MarketTopPlatformsViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsService.swift index e79a6b8a03..a2f83c626a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketTopPlatforms/MarketTopPlatformsService.swift @@ -2,7 +2,6 @@ import Foundation import Combine import RxSwift import RxRelay -import CurrencyKit import MarketKit import HsExtensions @@ -10,7 +9,7 @@ class MarketTopPlatformsService { typealias Item = TopPlatform private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private var disposeBag = DisposeBag() private var cancellables = Set() private var tasks = Set() @@ -22,12 +21,12 @@ class MarketTopPlatformsService { @PostPublished private(set) var state: MarketListServiceState = .loading - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, appManager: IAppManager, timePeriod: HsTimePeriod) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, appManager: IAppManager, timePeriod: HsTimePeriod) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.timePeriod = timePeriod - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher .sink { [weak self] _ in self?.sync() } @@ -100,7 +99,7 @@ extension MarketTopPlatformsService: IMarketListService { extension MarketTopPlatformsService: IMarketListTopPlatformDecoratorService { var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistModule.swift index 1e35e561df..0e3bf25e1c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistModule.swift @@ -6,7 +6,7 @@ struct MarketWatchlistModule { static func viewController() -> MarketWatchlistViewController { let service = MarketWatchlistService( marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, favoritesManager: App.shared.favoritesManager, appManager: App.shared.appManager, storage: StorageKit.LocalStorage.default diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistService.swift index 42b94d208b..b12704a6e9 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketWatchlist/MarketWatchlistService.swift @@ -2,7 +2,6 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import StorageKit import HsExtensions @@ -13,7 +12,7 @@ class MarketWatchlistService: IMarketMultiSortHeaderService { private let keyMarketField = "market-watchlist-market-field" private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let favoritesManager: FavoritesManager private let appManager: IAppManager private let storage: StorageKit.ILocalStorage @@ -32,9 +31,9 @@ class MarketWatchlistService: IMarketMultiSortHeaderService { private var coinUids = [String]() - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, favoritesManager: FavoritesManager, appManager: IAppManager, storage: StorageKit.ILocalStorage) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, favoritesManager: FavoritesManager, appManager: IAppManager, storage: StorageKit.ILocalStorage) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.favoritesManager = favoritesManager self.appManager = appManager self.storage = storage @@ -106,7 +105,7 @@ extension MarketWatchlistService: IMarketListService { } func load() { - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher .sink { [weak self] _ in self?.syncMarketInfos() } @@ -143,7 +142,7 @@ extension MarketWatchlistService: IMarketListDecoratorService { } var currency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var priceChangeType: MarketModule.PriceChangeType { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformMarketCapFetcher.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformMarketCapFetcher.swift index 217ef175cb..b7acf081f0 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformMarketCapFetcher.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformMarketCapFetcher.swift @@ -1,14 +1,13 @@ import MarketKit -import CurrencyKit class TopPlatformMarketCapFetcher { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let topPlatform: TopPlatform - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, topPlatform: TopPlatform) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, topPlatform: TopPlatform) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.topPlatform = topPlatform } @@ -17,7 +16,7 @@ class TopPlatformMarketCapFetcher { extension TopPlatformMarketCapFetcher: IMetricChartFetcher { var valueType: MetricChartModule.ValueType { - .compactCurrencyValue(currencyKit.baseCurrency) + .compactCurrencyValue(currencyManager.baseCurrency) } var intervals: [HsTimePeriod] { @@ -25,7 +24,7 @@ extension TopPlatformMarketCapFetcher: IMetricChartFetcher { } func fetch(interval: HsTimePeriod) async throws -> MetricChartModule.ItemData { - let points = try await marketKit.topPlatformMarketCapChart(platform: topPlatform.blockchain.uid, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.topPlatformMarketCapChart(platform: topPlatform.blockchain.uid, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) let items = points.map { point -> MetricChartModule.Item in MetricChartModule.Item(value: point.marketCap, timestamp: point.timestamp) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformModule.swift index cc178c00f4..d3c2e6a8a6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Market/TopPlatform/TopPlatformModule.swift @@ -8,10 +8,10 @@ struct TopPlatformModule { static func viewController(topPlatform: TopPlatform) -> UIViewController { let service = TopPlatformService(topPlatform: topPlatform, marketKit: App.shared.marketKit) - let listService = MarketFilteredListService(currencyKit: App.shared.currencyKit, provider: service) + let listService = MarketFilteredListService(currencyManager: App.shared.currencyManager, provider: service) let watchlistToggleService = MarketWatchlistToggleService(coinUidService: listService, favoritesManager: App.shared.favoritesManager) - let marketCapFetcher = TopPlatformMarketCapFetcher(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, topPlatform: topPlatform) + let marketCapFetcher = TopPlatformMarketCapFetcher(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, topPlatform: topPlatform) let chartService = MetricChartService(chartFetcher: marketCapFetcher, interval: .day1) let factory = MetricChartFactory(currentLocale: LanguageManager.shared.currentLocale) let chartViewModel = MetricChartViewModel(service: chartService, factory: factory) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartFactory.swift index ba5f25c220..251b63d9b2 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartFactory.swift @@ -1,7 +1,6 @@ import Foundation import MarketKit import LanguageKit -import CurrencyKit import Chart class MetricChartFactory { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartModule.swift index 94b35ab16d..b0057ae587 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartModule.swift @@ -3,7 +3,6 @@ import UIKit import Chart import LanguageKit import MarketKit -import CurrencyKit protocol IMetricChartFetcher { var valueType: MetricChartModule.ValueType { get } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartService.swift index 299e4bbacd..dd2fe7dfc1 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartService.swift @@ -1,7 +1,6 @@ import Combine import UIKit import MarketKit -import CurrencyKit import HsExtensions class MetricChartService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartViewModel.swift index 834eb5fcde..2826f363ee 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/MetricChart/MetricChartViewModel.swift @@ -5,7 +5,6 @@ import RxRelay import RxCocoa import MarketKit import Chart -import CurrencyKit import HUD class MetricChartViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftModule.swift index 715727902b..9ffe41edaa 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftModule.swift @@ -6,7 +6,7 @@ struct NftModule { static func viewController() -> UIViewController? { let coinPriceService = WalletCoinPriceService( tag: "nft", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftService.swift index c1ae220693..eaa749864a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftService.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import MarketKit -import CurrencyKit class NftService { private let account: Account diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftViewModel.swift index 9f74463fe2..d9f0337f24 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Nft/NftViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import RxCocoa -import CurrencyKit class NftViewModel { private let service: NftService diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewModule.swift index bcf68f74ae..801e20d7eb 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewModule.swift @@ -5,7 +5,7 @@ struct NftAssetOverviewModule { static func viewController(providerCollectionUid: String, nftUid: NftUid) -> NftAssetOverviewViewController { let coinPriceService = WalletCoinPriceService( tag: "nft-asset-overview", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewService.swift index 5d16178846..d878625b6f 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewService.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import MarketKit -import CurrencyKit import Kingfisher class NftAssetOverviewService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewViewModel.swift index 5a44124865..676b5a5355 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftAsset/Overview/NftAssetOverviewViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit class NftAssetOverviewViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityModule.swift index c2c73e0a47..24458c8784 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityModule.swift @@ -5,7 +5,7 @@ import MarketKit struct NftActivityModule { static func viewController(eventListType: NftEventListType, defaultEventType: NftEventMetadata.EventType? = .sale) -> NftActivityViewController { - let coinPriceService = WalletCoinPriceService(tag: "nft-activity", currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinPriceService = WalletCoinPriceService(tag: "nft-activity", currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let service = NftActivityService(eventListType: eventListType, defaultEventType: defaultEventType, nftMetadataManager: App.shared.nftMetadataManager, coinPriceService: coinPriceService) let viewModel = NftActivityViewModel(service: service) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityViewModel.swift index fb2ce8d27f..9436f27ea7 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Activity/NftActivityViewModel.swift @@ -1,7 +1,6 @@ import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit class NftActivityViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsModule.swift index 52244f549e..eee6168504 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsModule.swift @@ -3,7 +3,7 @@ import MarketKit struct NftCollectionAssetsModule { static func viewController(blockchainType: BlockchainType, providerCollectionUid: String) -> NftCollectionAssetsViewController { - let coinPriceService = WalletCoinPriceService(tag: "nft-collection-assets", currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinPriceService = WalletCoinPriceService(tag: "nft-collection-assets", currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let service = NftCollectionAssetsService(blockchainType: blockchainType, providerCollectionUid: providerCollectionUid, nftMetadataManager: App.shared.nftMetadataManager, coinPriceService: coinPriceService) let viewModel = NftCollectionAssetsViewModel(service: service) return NftCollectionAssetsViewController(viewModel: viewModel) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsViewModel.swift index 062e5f4651..5ed13d5f19 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Assets/NftCollectionAssetsViewModel.swift @@ -1,7 +1,6 @@ import RxSwift import RxRelay import RxCocoa -import CurrencyKit import MarketKit class NftCollectionAssetsViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewModule.swift index 2909a85cbf..a7b451f389 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewModule.swift @@ -9,7 +9,7 @@ struct NftCollectionOverviewModule { let coinService = CoinService( token: baseToken, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewViewModel.swift index b8e03daa40..c28544ba7b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/NftCollection/Overview/NftCollectionOverviewViewModel.swift @@ -1,5 +1,4 @@ import Chart -import CurrencyKit import Foundation import MarketKit import RxCocoa diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/CoinProChartModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/CoinProChartModule.swift index 1ebeb98f38..27b5775d4f 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/CoinProChartModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/CoinProChartModule.swift @@ -7,7 +7,7 @@ import MarketKit class CoinProChartModule { static func viewController(coin: Coin, type: ProChartType) -> UIViewController { - let chartFetcher = ProChartFetcher(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit, coin: coin, type: type) + let chartFetcher = ProChartFetcher(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager, coin: coin, type: type) let chartService = MetricChartService( chartFetcher: chartFetcher, diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/ProChartFetcher.swift b/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/ProChartFetcher.swift index e0b012414f..dba01e3934 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/ProChartFetcher.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/ProFeatures/ProCharts/ProChartFetcher.swift @@ -1,17 +1,16 @@ import Foundation import MarketKit -import CurrencyKit import Chart class ProChartFetcher { private let marketKit: MarketKit.Kit - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let coin: Coin private let type: CoinProChartModule.ProChartType - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit, coin: Coin, type: CoinProChartModule.ProChartType) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager, coin: Coin, type: CoinProChartModule.ProChartType) { self.marketKit = marketKit - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.coin = coin self.type = type } @@ -32,26 +31,26 @@ extension ProChartFetcher: IMetricChartFetcher { var valueType: MetricChartModule.ValueType { switch type { case .activeAddresses, .txCount: return .counter - default: return .compactCurrencyValue(currencyKit.baseCurrency) + default: return .compactCurrencyValue(currencyManager.baseCurrency) } } func fetch(interval: HsTimePeriod) async throws -> MetricChartModule.ItemData { switch type { case .cexVolume: - let data = try await marketKit.cexVolumes(coinUid: coin.uid, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let data = try await marketKit.cexVolumes(coinUid: coin.uid, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) return MetricChartModule.ItemData( items: data.points.map { MetricChartModule.Item(value: $0.value, timestamp: $0.timestamp) }, type: .aggregated(value: data.aggregatedValue) ) case .dexVolume: - let data = try await marketKit.dexVolumes(coinUid: coin.uid, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let data = try await marketKit.dexVolumes(coinUid: coin.uid, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) return MetricChartModule.ItemData( items: data.points.map { MetricChartModule.Item(value: $0.value, timestamp: $0.timestamp) }, type: .aggregated(value: data.aggregatedValue) ) case .dexLiquidity: - let points = try await marketKit.dexLiquidity(coinUid: coin.uid, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.dexLiquidity(coinUid: coin.uid, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) return MetricChartModule.ItemData( items: points.map { MetricChartModule.Item(value: $0.value, timestamp: $0.timestamp) }, type: .regular @@ -73,7 +72,7 @@ extension ProChartFetcher: IMetricChartFetcher { type: .aggregated(value: data.aggregatedValue) ) case .tvl: - let points = try await marketKit.marketInfoTvl(coinUid: coin.uid, currencyCode: currencyKit.baseCurrency.code, timePeriod: interval) + let points = try await marketKit.marketInfoTvl(coinUid: coin.uid, currencyCode: currencyManager.baseCurrency.code, timePeriod: interval) return MetricChartModule.ItemData( items: points.map { MetricChartModule.Item(value: $0.value, timestamp: $0.timestamp) }, type: .regular diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/AmountCaution/SendAmountCautionViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/AmountCaution/SendAmountCautionViewModel.swift index e56bb559d5..aa555a9542 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/AmountCaution/SendAmountCautionViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/AmountCaution/SendAmountCautionViewModel.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxCocoa -import CurrencyKit import MarketKit class SendAmountCautionViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Confirmation/SendConfirmationModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Confirmation/SendConfirmationModule.swift index 3ca47d489a..070645bb08 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Confirmation/SendConfirmationModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Confirmation/SendConfirmationModule.swift @@ -1,4 +1,3 @@ -import CurrencyKit protocol ISendConfirmationViewItemNew {} diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/FeeWarning/SendFeeSettingsAmountCautionViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/FeeWarning/SendFeeSettingsAmountCautionViewModel.swift index 3c173eb2cb..1e7dc2e343 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/FeeWarning/SendFeeSettingsAmountCautionViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/FeeWarning/SendFeeSettingsAmountCautionViewModel.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxCocoa -import CurrencyKit import MarketKit class SendFeeSettingsAmountCautionViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/SendBitcoinFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/SendBitcoinFactory.swift index dd77b9d856..dec43be9ea 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/SendBitcoinFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/SendBitcoinFactory.swift @@ -1,7 +1,6 @@ import UIKit import MarketKit import HsToolKit -import CurrencyKit protocol ISendConfirmationFactory { func confirmationViewController() throws -> UIViewController diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/SendModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/SendModule.swift index dda2036a70..8ebee55866 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/SendModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/SendModule.swift @@ -38,8 +38,8 @@ class SendModule { } let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let coinService = CoinService(token: token, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CoinService(token: token, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) // Amount let amountInputService = SendBitcoinAmountInputService(token: token) @@ -62,7 +62,7 @@ class SendModule { // Fee let feeRateService = FeeRateService(provider: feeRateProvider) - let feeFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let feeFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let feeService = SendFeeService(fiatService: feeFiatService, feeToken: token) let inputOutputOrderService = InputOutputOrderService(blockchainType: adapter.blockchainType, blockchainManager: App.shared.btcBlockchainManager, itemsList: TransactionDataSortMode.allCases) @@ -162,8 +162,8 @@ class SendModule { let feeToken = App.shared.feeCoinProvider.feeToken(token: token) ?? token let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let coinService = CoinService(token: token, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CoinService(token: token, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) // Amount let amountInputService = SendBitcoinAmountInputService(token: token) @@ -180,7 +180,7 @@ class SendModule { let memoService = SendMemoInputService(maxSymbols: 120) // Fee - let feeFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let feeFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let feeService = SendFeeService(fiatService: feeFiatService, feeToken: feeToken) let service = SendBinanceService( @@ -253,8 +253,8 @@ class SendModule { private static func viewController(token: Token, mode: SendBaseService.Mode, adapter: ISendZcashAdapter) -> UIViewController? { let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let coinService = CoinService(token: token, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CoinService(token: token, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) // Amount let amountInputService = SendBitcoinAmountInputService(token: token) @@ -271,7 +271,7 @@ class SendModule { let memoService = SendMemoInputService(maxSymbols: 120) // Fee - let feeFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let feeFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let feeService = SendFeeService(fiatService: feeFiatService, feeToken: token) let service = SendZcashService( diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/AmountInputViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/AmountInputViewModel.swift index 0688ca3680..d017ca8da6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/AmountInputViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/AmountInputViewModel.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxCocoa -import CurrencyKit import MarketKit protocol IAmountInputService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/Confirmation/SendEvmConfirmationModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/Confirmation/SendEvmConfirmationModule.swift index 18f8f90090..587439ee39 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/Confirmation/SendEvmConfirmationModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/Confirmation/SendEvmConfirmationModule.swift @@ -87,7 +87,7 @@ struct SendEvmConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: evmKitWrapper.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil @@ -126,7 +126,7 @@ struct SendEvmConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: evmKitWrapper.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { throw CreateModuleError.cantCreateFeeRateProvider diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendAvailableBalanceViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendAvailableBalanceViewModel.swift index 491ecf3d22..c75c952ae0 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendAvailableBalanceViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendAvailableBalanceViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import BigInt -import CurrencyKit protocol IAvailableBalanceService: AnyObject { var availableBalance: DataStatus { get } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendEvmModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendEvmModule.swift index 9f5e0928c4..e4e7c523f0 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendEvmModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendEvm/SendEvmModule.swift @@ -29,11 +29,11 @@ class SendEvmModule { let service = SendEvmService(token: token, mode: mode, adapter: adapter, addressService: addressService) let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) - let coinService = CoinService(token: token, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CoinService(token: token, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let viewModel = SendEvmViewModel(service: service) let availableBalanceViewModel = SendAvailableBalanceViewModel(service: service, coinService: coinService, switchService: switchService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/IntegerAmountInput/IntegerAmountInputViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/IntegerAmountInput/IntegerAmountInputViewModel.swift index b3bdba862e..3ada591542 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/IntegerAmountInput/IntegerAmountInputViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/IntegerAmountInput/IntegerAmountInputViewModel.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxCocoa -import CurrencyKit import MarketKit protocol IIntegerAmountInputService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/SendEip1155AvailableBalanceViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/SendEip1155AvailableBalanceViewModel.swift index 40ff8a4054..efbb5b58ca 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/SendEip1155AvailableBalanceViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendNft/Eip1155/SendEip1155AvailableBalanceViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import BigInt -import CurrencyKit class SendEip1155AvailableBalanceViewModel { private var queue = DispatchQueue(label: "\(AppConfig.label).available-balance-view-model", qos: .userInitiated) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/Confirmation/SendTronConfirmationModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/Confirmation/SendTronConfirmationModule.swift index d64f33ef8f..4981e2e780 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/Confirmation/SendTronConfirmationModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/Confirmation/SendTronConfirmationModule.swift @@ -12,14 +12,14 @@ struct SendTronConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: .tron, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil } let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let feeFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let feeFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let feeService = SendFeeService(fiatService: feeFiatService, feeToken: coinServiceFactory.baseCoinService.token) let feeViewModel = SendFeeViewModel(service: feeService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/SendTronModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/SendTronModule.swift index a743969373..aeca01f49c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/SendTronModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendTron/SendTronModule.swift @@ -18,11 +18,11 @@ class SendTronModule { let service = SendTronService(token: token, mode: mode, adapter: adapter, addressService: addressService) let switchService = AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) - let coinService = CoinService(token: token, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let coinService = CoinService(token: token, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) let viewModel = SendTronViewModel(service: service) let availableBalanceViewModel = SendAvailableBalanceViewModel(service: service, coinService: coinService, switchService: switchService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsModule.swift index c2f7c389e6..0ffcef8289 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsModule.swift @@ -4,7 +4,7 @@ import ThemeKit struct BaseCurrencySettingsModule { static func viewController() -> UIViewController { - let service = BaseCurrencySettingsService(currencyKit: App.shared.currencyKit) + let service = BaseCurrencySettingsService(currencyManager: App.shared.currencyManager) let viewModel = BaseCurrencySettingsViewModel(service: service) return BaseCurrencySettingsViewController(viewModel: viewModel) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsService.swift index b387caf9ca..d179a63900 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsService.swift @@ -1,23 +1,22 @@ import RxSwift import RxRelay -import CurrencyKit class BaseCurrencySettingsService { private static let popularCurrencyCodes = ["USD", "EUR", "GBP", "JPY"] private static let cryptoCurrencyCodes = ["BTC", "ETH", "BNB"] - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager let popularCurrencies: [Currency] let cryptoCurrencies: [Currency] let otherCurrencies: [Currency] - init(currencyKit: CurrencyKit.Kit) { - self.currencyKit = currencyKit + init(currencyManager: CurrencyManager) { + self.currencyManager = currencyManager var popularCurrencies = [Currency]() let cryptoCurrencies = [Currency]() - var currencies = currencyKit.currencies + var currencies = currencyManager.currencies for code in BaseCurrencySettingsService.popularCurrencyCodes { if let index = currencies.firstIndex(where: { $0.code == code }) { @@ -42,15 +41,15 @@ class BaseCurrencySettingsService { extension BaseCurrencySettingsService { var baseCurrency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } func setBaseCurrency(code: String) { - guard let currency = currencyKit.currencies.first(where: { $0.code == code }) else { + guard let currency = currencyManager.currencies.first(where: { $0.code == code }) else { return } - currencyKit.baseCurrency = currency + currencyManager.baseCurrency = currency } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsViewModel.swift index df33c93baf..2ee5715d43 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/BaseCurrency/BaseCurrencySettingsViewModel.swift @@ -2,7 +2,6 @@ import UIKit import RxSwift import RxRelay import RxCocoa -import CurrencyKit class BaseCurrencySettingsViewModel { private let service: BaseCurrencySettingsService @@ -28,7 +27,7 @@ class BaseCurrencySettingsViewModel { private func viewItem(currency: Currency, selected: Bool) -> ViewItem { ViewItem( - icon: CurrencyKit.Kit.currencyIcon(code: currency.code), + icon: UIImage(named: currency.code), code: currency.code, symbol: currency.symbol, selected: selected diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsModule.swift index 5e00970a00..31c50b74a5 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsModule.swift @@ -11,7 +11,7 @@ struct MainSettingsModule { passcodeManager: App.shared.passcodeManager, termsManager: App.shared.termsManager, systemInfoManager: App.shared.systemInfoManager, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, walletConnectSessionManager: App.shared.walletConnectSessionManager, subscriptionManager: App.shared.subscriptionManager, rateAppManager: App.shared.rateAppManager diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsService.swift index b8450b15d8..a0ee32292e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Main/MainSettingsService.swift @@ -1,5 +1,4 @@ import Combine -import CurrencyKit import LanguageKit import RxRelay import RxSwift @@ -17,7 +16,7 @@ class MainSettingsService { private let passcodeManager: PasscodeManager private let termsManager: TermsManager private let systemInfoManager: SystemInfoManager - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let walletConnectSessionManager: WalletConnectSessionManager private let subscriptionManager: SubscriptionManager private let rateAppManager: RateAppManager @@ -26,7 +25,7 @@ class MainSettingsService { private let noWalletRequiredActionsRelay = BehaviorRelay(value: false) init(backupManager: BackupManager, cloudAccountBackupManager: CloudBackupManager, accountRestoreWarningManager: AccountRestoreWarningManager, accountManager: AccountManager, contactBookManager: ContactBookManager, passcodeManager: PasscodeManager, termsManager: TermsManager, - systemInfoManager: SystemInfoManager, currencyKit: CurrencyKit.Kit, walletConnectSessionManager: WalletConnectSessionManager, subscriptionManager: SubscriptionManager, rateAppManager: RateAppManager) + systemInfoManager: SystemInfoManager, currencyManager: CurrencyManager, walletConnectSessionManager: WalletConnectSessionManager, subscriptionManager: SubscriptionManager, rateAppManager: RateAppManager) { self.cloudAccountBackupManager = cloudAccountBackupManager self.backupManager = backupManager @@ -36,7 +35,7 @@ class MainSettingsService { self.passcodeManager = passcodeManager self.termsManager = termsManager self.systemInfoManager = systemInfoManager - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.walletConnectSessionManager = walletConnectSessionManager self.subscriptionManager = subscriptionManager self.rateAppManager = rateAppManager @@ -114,11 +113,11 @@ extension MainSettingsService { } var baseCurrency: Currency { - currencyKit.baseCurrency + currencyManager.baseCurrency } var baseCurrencyPublisher: AnyPublisher { - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher } var appVersion: String { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchModule.swift index 036c425adc..bf860af163 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchModule.swift @@ -56,7 +56,7 @@ extension OneInchModule: ISwapProvider { switchService: AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default, useLocalStorage: false), allowanceService: allowanceService, pendingAllowanceService: pendingAllowanceService, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, viewItemHelper: SwapViewItemHelper() ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchService.swift index ef136c7943..0f1af9fa88 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchService.swift @@ -2,7 +2,6 @@ import RxSwift import RxRelay import HsToolKit import UniswapKit -import CurrencyKit import BigInt import EvmKit import Foundation diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchViewModel.swift index 2b63778116..fbc1b0c001 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import UniswapKit -import CurrencyKit import EvmKit class OneInchViewModel { @@ -12,7 +11,7 @@ class OneInchViewModel { public let service: OneInchService public let tradeService: OneInchTradeService public let switchService: AmountTypeSwitchService - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let allowanceService: SwapAllowanceService private let pendingAllowanceService: SwapPendingAllowanceService @@ -35,13 +34,13 @@ class OneInchViewModel { private var openRevokeRelay = PublishRelay() private var openApproveRelay = PublishRelay() - init(service: OneInchService, tradeService: OneInchTradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyKit: CurrencyKit.Kit, viewItemHelper: SwapViewItemHelper) { + init(service: OneInchService, tradeService: OneInchTradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyManager: CurrencyManager, viewItemHelper: SwapViewItemHelper) { self.service = service self.tradeService = tradeService self.switchService = switchService self.allowanceService = allowanceService self.pendingAllowanceService = pendingAllowanceService - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.viewItemHelper = viewItemHelper subscribeToService() @@ -211,7 +210,7 @@ class OneInchViewModel { extension OneInchViewModel { var amountTypeSelectorItems: [String] { - ["swap.amount_type.coin".localized, currencyKit.baseCurrency.code] + ["swap.amount_type.coin".localized, currencyManager.baseCurrency.code] } var amountTypeIndexDriver: Driver { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift index 8a22b7c2fd..d4839675e3 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift @@ -56,7 +56,7 @@ extension UniswapModule: ISwapProvider { switchService: AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default, useLocalStorage: false), allowanceService: allowanceService, pendingAllowanceService: pendingAllowanceService, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, viewItemHelper: SwapViewItemHelper() ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapService.swift index 24e4777909..b0bedc8f65 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapService.swift @@ -2,7 +2,6 @@ import RxSwift import RxRelay import HsToolKit import UniswapKit -import CurrencyKit import BigInt import EvmKit import Foundation diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift index d934352ca0..64e351cd92 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import UniswapKit -import CurrencyKit import EvmKit class UniswapViewModel { @@ -11,7 +10,7 @@ class UniswapViewModel { public let service: UniswapService public let tradeService: UniswapTradeService public let switchService: AmountTypeSwitchService - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let allowanceService: SwapAllowanceService private let pendingAllowanceService: SwapPendingAllowanceService @@ -39,13 +38,13 @@ class UniswapViewModel { private let scheduler = SerialDispatchQueueScheduler(qos: .userInitiated, internalSerialQueueName: "\(AppConfig.label).swap_view_model") - init(service: UniswapService, tradeService: UniswapTradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyKit: CurrencyKit.Kit, viewItemHelper: SwapViewItemHelper) { + init(service: UniswapService, tradeService: UniswapTradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyManager: CurrencyManager, viewItemHelper: SwapViewItemHelper) { self.service = service self.tradeService = tradeService self.switchService = switchService self.allowanceService = allowanceService self.pendingAllowanceService = pendingAllowanceService - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.viewItemHelper = viewItemHelper subscribeToService() @@ -235,7 +234,7 @@ class UniswapViewModel { extension UniswapViewModel { var amountTypeSelectorItems: [String] { - ["swap.amount_type.coin".localized, currencyKit.baseCurrency.code] + ["swap.amount_type.coin".localized, currencyManager.baseCurrency.code] } var amountTypeIndexDriver: Driver { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Module.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Module.swift index a57e80bf9b..e74db03519 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Module.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Module.swift @@ -56,7 +56,7 @@ extension UniswapV3Module: ISwapProvider { switchService: AmountTypeSwitchService(localStorage: StorageKit.LocalStorage.default, useLocalStorage: false), allowanceService: allowanceService, pendingAllowanceService: pendingAllowanceService, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, viewItemHelper: SwapViewItemHelper() ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Service.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Service.swift index 99349555b1..7e8c632db1 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Service.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3Service.swift @@ -2,7 +2,6 @@ import RxSwift import RxRelay import HsToolKit import UniswapKit -import CurrencyKit import BigInt import EvmKit import Foundation diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift index a17793c2a0..320d5ebd51 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import UniswapKit -import CurrencyKit import EvmKit import HsToolKit @@ -12,7 +11,7 @@ class UniswapV3ViewModel { public let service: UniswapV3Service public let tradeService: UniswapV3TradeService public let switchService: AmountTypeSwitchService - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let allowanceService: SwapAllowanceService private let pendingAllowanceService: SwapPendingAllowanceService @@ -40,13 +39,13 @@ class UniswapV3ViewModel { private let scheduler = SerialDispatchQueueScheduler(qos: .userInitiated, internalSerialQueueName: "\(AppConfig.label).swap_view_model") - init(service: UniswapV3Service, tradeService: UniswapV3TradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyKit: CurrencyKit.Kit, viewItemHelper: SwapViewItemHelper) { + init(service: UniswapV3Service, tradeService: UniswapV3TradeService, switchService: AmountTypeSwitchService, allowanceService: SwapAllowanceService, pendingAllowanceService: SwapPendingAllowanceService, currencyManager: CurrencyManager, viewItemHelper: SwapViewItemHelper) { self.service = service self.tradeService = tradeService self.switchService = switchService self.allowanceService = allowanceService self.pendingAllowanceService = pendingAllowanceService - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.viewItemHelper = viewItemHelper subscribeToService() @@ -239,7 +238,7 @@ class UniswapV3ViewModel { extension UniswapV3ViewModel { var amountTypeSelectorItems: [String] { - ["swap.amount_type.coin".localized, currencyKit.baseCurrency.code] + ["swap.amount_type.coin".localized, currencyManager.baseCurrency.code] } var amountTypeIndexDriver: Driver { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/CoinCardModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/CoinCardModule.swift index 33fd23543c..d80a7c331e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/CoinCardModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/CoinCardModule.swift @@ -39,7 +39,7 @@ struct CoinCardModule { static func fromCell(service: UniswapService, tradeService: UniswapTradeService, switchService: AmountTypeSwitchService) -> SwapCoinCardCell { let coinCardService = SwapFromCoinCardService(service: service, tradeService: tradeService) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) let viewModel = SwapCoinCardViewModel(coinCardService: coinCardService, fiatService: fiatService) @@ -56,7 +56,7 @@ struct CoinCardModule { static func toCell(service: UniswapService, tradeService: UniswapTradeService, switchService: AmountTypeSwitchService) -> SwapCoinCardCell { let coinCardService = SwapToCoinCardService(service: service, tradeService: tradeService) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) let viewModel = SwapCoinCardViewModel(coinCardService: coinCardService, fiatService: fiatService) @@ -74,7 +74,7 @@ struct CoinCardModule { static func fromCell(service: OneInchService, tradeService: OneInchTradeService, switchService: AmountTypeSwitchService) -> SwapCoinCardCell { let coinCardService = SwapFromCoinCardOneInchService(service: service, tradeService: tradeService) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) let viewModel = SwapCoinCardViewModel(coinCardService: coinCardService, fiatService: fiatService) @@ -91,7 +91,7 @@ struct CoinCardModule { static func toCell(service: OneInchService, tradeService: OneInchTradeService, switchService: AmountTypeSwitchService) -> SwapCoinCardCell { let coinCardService = SwapToCoinCardOneInchService(service: service, tradeService: tradeService) - let fiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fiatService.toggleAvailableObservable) let viewModel = SwapCoinCardViewModel(coinCardService: coinCardService, fiatService: fiatService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardViewModel.swift index a737dda390..ec780236aa 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import UniswapKit -import CurrencyKit import MarketKit class SwapCoinCardViewModel { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/Confirmation/SwapApproveConfirmationModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/Confirmation/SwapApproveConfirmationModule.swift index af5273ec8c..2d48f4a369 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/Confirmation/SwapApproveConfirmationModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/Confirmation/SwapApproveConfirmationModule.swift @@ -14,7 +14,7 @@ struct SwapApproveConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: dex.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/SwapApproveModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/SwapApproveModule.swift index 3330fee1e9..30505c4ddd 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/SwapApproveModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SwapApprove/SwapApproveModule.swift @@ -13,7 +13,7 @@ struct SwapApproveModule { let coinService = CoinService( token: data.token, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SwapConfirmation/SwapConfirmationModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SwapConfirmation/SwapConfirmationModule.swift index 1e7b7f845d..3ef0f39e77 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SwapConfirmation/SwapConfirmationModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SwapConfirmation/SwapConfirmationModule.swift @@ -13,7 +13,7 @@ struct SwapConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: dex.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil @@ -47,7 +47,7 @@ struct SwapConfirmationModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: dex.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SwapNew/InputCard/SwapInputModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SwapNew/InputCard/SwapInputModule.swift index 8aa3fdb5c9..c934c62c53 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SwapNew/InputCard/SwapInputModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SwapNew/InputCard/SwapInputModule.swift @@ -6,8 +6,8 @@ class SwapInputModule { let fromCoinCardService = SwapFromCoinCardService(service: service, tradeService: tradeService) let toCoinCardService = SwapToCoinCardService(service: service, tradeService: tradeService) - let fromFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let toFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fromFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let toFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fromFiatService.toggleAvailableObservable) switchService.add(toggleAllowedObservable: toFiatService.toggleAvailableObservable) @@ -38,8 +38,8 @@ class SwapInputModule { let fromCoinCardService = SwapV3FromCoinCardService(service: service, tradeService: tradeService) let toCoinCardService = SwapV3ToCoinCardService(service: service, tradeService: tradeService) - let fromFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let toFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fromFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let toFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fromFiatService.toggleAvailableObservable) switchService.add(toggleAllowedObservable: toFiatService.toggleAvailableObservable) @@ -70,8 +70,8 @@ class SwapInputModule { let fromCoinCardService = SwapFromCoinCardOneInchService(service: service, tradeService: tradeService) let toCoinCardService = SwapToCoinCardOneInchService(service: service, tradeService: tradeService) - let fromFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) - let toFiatService = FiatService(switchService: switchService, currencyKit: App.shared.currencyKit, marketKit: App.shared.marketKit) + let fromFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) + let toFiatService = FiatService(switchService: switchService, currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit) switchService.add(toggleAllowedObservable: fromFiatService.toggleAvailableObservable) switchService.add(toggleAllowedObservable: toFiatService.toggleAvailableObservable) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoModule.swift index fb1e7e90e3..bebbfbfa46 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoModule.swift @@ -1,5 +1,4 @@ import UIKit -import CurrencyKit import MarketKit struct TransactionInfoModule { @@ -8,10 +7,10 @@ struct TransactionInfoModule { guard let adapter = App.shared.transactionAdapterManager.adapter(for: transactionRecord.source) else { return nil } - let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let nftMetadataService = NftMetadataService(nftMetadataManager: App.shared.nftMetadataManager) - let service = TransactionInfoService(transactionRecord: transactionRecord, adapter: adapter, currencyKit: App.shared.currencyKit, rateService: rateService, nftMetadataService: nftMetadataService) + let service = TransactionInfoService(transactionRecord: transactionRecord, adapter: adapter, currencyManager: App.shared.currencyManager, rateService: rateService, nftMetadataService: nftMetadataService) let contactLabelService = ContactLabelService(contactManager: App.shared.contactManager, blockchainType: transactionRecord.source.blockchainType) let factory = TransactionInfoViewItemFactory(evmLabelManager: App.shared.evmLabelManager, contactLabelService: contactLabelService, actionEnabled: transactionRecord.source.blockchainType.resendable) let viewModel = TransactionInfoViewModel(service: service, factory: factory, contactLabelService: contactLabelService) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoService.swift index 528b9446eb..f9366eb1c2 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoService.swift @@ -1,4 +1,3 @@ -import CurrencyKit import EvmKit import MarketKit import RxSwift @@ -7,7 +6,7 @@ class TransactionInfoService { private let disposeBag = DisposeBag() private let adapter: ITransactionsAdapter - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let rateService: HistoricalRateService private let nftMetadataService: NftMetadataService @@ -17,10 +16,10 @@ class TransactionInfoService { private let transactionInfoItemSubject = PublishSubject() - init(transactionRecord: TransactionRecord, adapter: ITransactionsAdapter, currencyKit: CurrencyKit.Kit, rateService: HistoricalRateService, nftMetadataService: NftMetadataService) { + init(transactionRecord: TransactionRecord, adapter: ITransactionsAdapter, currencyManager: CurrencyManager, rateService: HistoricalRateService, nftMetadataService: NftMetadataService) { self.transactionRecord = transactionRecord self.adapter = adapter - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.rateService = rateService self.nftMetadataService = nftMetadataService diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewController.swift b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewController.swift index 9302eeebdd..1547fcfea2 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewController.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewController.swift @@ -2,7 +2,6 @@ import UIKit import ActionSheet import ThemeKit import SectionsTableView -import CurrencyKit import ComponentKit import RxSwift import SafariServices diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewItemFactory.swift index 54c34a9379..eec1c0cc9b 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewItemFactory.swift @@ -1,6 +1,5 @@ import Foundation import MarketKit -import CurrencyKit import EvmKit class TransactionInfoViewItemFactory { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewModel.swift index 3118a03e19..3c9c959894 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/TransactionInfo/TransactionInfoViewModel.swift @@ -1,7 +1,6 @@ import RxSwift import RxCocoa import MarketKit -import CurrencyKit class TransactionInfoViewModel { private let disposeBag = DisposeBag() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/BaseTransactionsService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/BaseTransactionsService.swift index 045a19f6ba..d1220a00a2 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/BaseTransactionsService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/BaseTransactionsService.swift @@ -1,7 +1,6 @@ import Foundation import RxSwift import RxRelay -import CurrencyKit import MarketKit class BaseTransactionsService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/CoinSelect/TransactionsCoinSelectViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/CoinSelect/TransactionsCoinSelectViewModel.swift index 4088470a9e..890241e12f 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/CoinSelect/TransactionsCoinSelectViewModel.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/CoinSelect/TransactionsCoinSelectViewModel.swift @@ -2,7 +2,6 @@ import Foundation import RxSwift import RxCocoa import MarketKit -import CurrencyKit class TransactionsCoinSelectViewModel { private let service: TransactionsCoinSelectService diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/HistoricalRateService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/HistoricalRateService.swift index 8e74d183d5..892ac8bad2 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/HistoricalRateService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/HistoricalRateService.swift @@ -3,7 +3,6 @@ import Combine import RxSwift import RxRelay import MarketKit -import CurrencyKit import HsExtensions class HistoricalRateService { @@ -19,11 +18,11 @@ class HistoricalRateService { private let queue = DispatchQueue(label: "\(AppConfig.label).transactions-historical-rate-service-queue", qos: .userInitiated) - init(marketKit: MarketKit.Kit, currencyKit: CurrencyKit.Kit) { + init(marketKit: MarketKit.Kit, currencyManager: CurrencyManager) { self.marketKit = marketKit - currency = currencyKit.baseCurrency + currency = currencyManager.baseCurrency - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher .sink { [weak self] currency in self?.handleUpdated(currency: currency) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsModule.swift index 616a1e4500..e75f732fd6 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsModule.swift @@ -1,12 +1,11 @@ import UIKit import RxSwift -import CurrencyKit import MarketKit struct TransactionsModule { static func viewController() -> UIViewController { - let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let nftMetadataService = NftMetadataService(nftMetadataManager: App.shared.nftMetadataManager) let service = TransactionsService( @@ -25,7 +24,7 @@ struct TransactionsModule { } static func dataSource(token: Token) -> TransactionsTableViewDataSource { - let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyKit: App.shared.currencyKit) + let rateService = HistoricalRateService(marketKit: App.shared.marketKit, currencyManager: App.shared.currencyManager) let nftMetadataService = NftMetadataService(nftMetadataManager: App.shared.nftMetadataManager) let service = TokenTransactionsService( diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewController.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewController.swift index ccf333c4f1..d8a82ad6a3 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewController.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewController.swift @@ -4,7 +4,6 @@ import ActionSheet import ThemeKit import HUD import ComponentKit -import CurrencyKit import RxSwift class TransactionsViewController: ThemeViewController { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewItemFactory.swift index c460cc6f4d..7e14faaf53 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionsViewItemFactory.swift @@ -1,5 +1,4 @@ import UIKit -import CurrencyKit import MarketKit import ComponentKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceModule.swift index ab4a64792c..e497b8a9f8 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceModule.swift @@ -9,7 +9,7 @@ struct WalletTokenBalanceModule { let coinPriceService = WalletCoinPriceService( tag: "wallet-token-balance", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceService.swift index bcbc6d358f..ee0ef38528 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceService.swift @@ -1,7 +1,6 @@ import Combine import Foundation import RxSwift -import CurrencyKit import HsExtensions class WalletTokenBalanceService { diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift index 577304d5f2..dd042b2b95 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Token/DataSources/WalletTokenBalance/WalletTokenBalanceViewItemFactory.swift @@ -1,4 +1,3 @@ -import CurrencyKit import Foundation import MarketKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListService.swift index 4a53d0034b..b0b64852d1 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListService.swift @@ -5,7 +5,6 @@ import RxRelay import HsToolKit import HsExtensions import StorageKit -import CurrencyKit class WalletTokenListService: IWalletTokenListService { private let elementService: IWalletElementService diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift index 4a503e2ade..483c7159ec 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/TokenList/WalletTokenListViewItemFactory.swift @@ -1,5 +1,4 @@ import Foundation -import CurrencyKit import MarketKit import EvmKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletCoinPriceService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletCoinPriceService.swift index 4c3fa6e46f..bc992ced3a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletCoinPriceService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletCoinPriceService.swift @@ -1,6 +1,5 @@ import Foundation import Combine -import CurrencyKit import MarketKit protocol IWalletCoinPriceServiceDelegate: AnyObject { @@ -12,7 +11,7 @@ class WalletCoinPriceService { weak var delegate: IWalletCoinPriceServiceDelegate? private let tag: String - private let currencyKit: CurrencyKit.Kit + private let currencyManager: CurrencyManager private let marketKit: MarketKit.Kit private var cancellables = Set() private var coinPriceCancellables = Set() @@ -22,14 +21,14 @@ class WalletCoinPriceService { private var feeCoinUids = Set() private var conversionCoinUids = Set() - init(tag: String, currencyKit: CurrencyKit.Kit, marketKit: MarketKit.Kit) { + init(tag: String, currencyManager: CurrencyManager, marketKit: MarketKit.Kit) { self.tag = tag - self.currencyKit = currencyKit + self.currencyManager = currencyManager self.marketKit = marketKit - currency = currencyKit.baseCurrency + currency = currencyManager.baseCurrency - currencyKit.baseCurrencyUpdatedPublisher + currencyManager.baseCurrencyUpdatedPublisher .sink { [weak self] currency in self?.onUpdate(baseCurrency: currency) } @@ -46,7 +45,7 @@ class WalletCoinPriceService { coinPriceCancellables = Set() if !coinUids.isEmpty { - marketKit.coinPriceMapPublisher(tag: tag, coinUids: Array(coinUids), currencyCode: currencyKit.baseCurrency.code) + marketKit.coinPriceMapPublisher(tag: tag, coinUids: Array(coinUids), currencyCode: currencyManager.baseCurrency.code) .sink { [weak self] in self?.onUpdate(coinPriceMap: $0) } @@ -54,13 +53,13 @@ class WalletCoinPriceService { } if !feeCoinUids.isEmpty { - marketKit.coinPriceMapPublisher(tag: "fee:\(tag)", coinUids: Array(feeCoinUids), currencyCode: currencyKit.baseCurrency.code) + marketKit.coinPriceMapPublisher(tag: "fee:\(tag)", coinUids: Array(feeCoinUids), currencyCode: currencyManager.baseCurrency.code) .sink { _ in } .store(in: &coinPriceCancellables) } if !conversionCoinUids.isEmpty { - marketKit.coinPriceMapPublisher(tag: "conversion:\(tag)", coinUids: Array(conversionCoinUids), currencyCode: currencyKit.baseCurrency.code) + marketKit.coinPriceMapPublisher(tag: "conversion:\(tag)", coinUids: Array(conversionCoinUids), currencyCode: currencyManager.baseCurrency.code) .sink { _ in } .store(in: &coinPriceCancellables) } @@ -72,7 +71,7 @@ class WalletCoinPriceService { } private func item(coinPrice: CoinPrice) -> Item { - let currency = currencyKit.baseCurrency + let currency = currencyManager.baseCurrency return Item( price: CurrencyValue(currency: currency, value: coinPrice.value), diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletModule.swift index 321f6c3e4d..65dcf47ca9 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletModule.swift @@ -1,4 +1,3 @@ -import CurrencyKit import LanguageKit import MarketKit import RxSwift @@ -10,7 +9,7 @@ struct WalletModule { static func viewController() -> UIViewController { let coinPriceService = WalletCoinPriceService( tag: "wallet", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) @@ -61,7 +60,7 @@ struct WalletModule { let coinPriceService = WalletCoinPriceService( tag: "send-token-list", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) @@ -116,7 +115,7 @@ struct WalletModule { let coinPriceService = WalletCoinPriceService( tag: "swap-token-list", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) @@ -171,7 +170,7 @@ struct WalletModule { if let account = App.shared.accountManager.activeAccount, !account.watchAccount, !account.cexAccount { let coinPriceService = WalletCoinPriceService( tag: "send-token-list", - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, marketKit: App.shared.marketKit ) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletService.swift index 86f034259e..8a2d851e3c 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletService.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletService.swift @@ -5,7 +5,6 @@ import RxRelay import HsToolKit import HsExtensions import StorageKit -import CurrencyKit protocol IWalletElementService: AnyObject { var delegate: IWalletElementServiceDelegate? { get set } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift index e656e0ab3e..a03210ce5a 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/WalletViewItemFactory.swift @@ -1,5 +1,4 @@ import Foundation -import CurrencyKit import MarketKit import EvmKit diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/SendEthereumTransaction/WalletConnectSendEthereumTransactionRequestModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/SendEthereumTransaction/WalletConnectSendEthereumTransactionRequestModule.swift index 34634aa5b7..c0a1358c41 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/SendEthereumTransaction/WalletConnectSendEthereumTransactionRequestModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/SendEthereumTransaction/WalletConnectSendEthereumTransactionRequestModule.swift @@ -13,7 +13,7 @@ struct WalletConnectSendEthereumTransactionRequestModule { guard let coinServiceFactory = EvmCoinServiceFactory( blockchainType: evmKitWrapper.blockchainType, marketKit: App.shared.marketKit, - currencyKit: App.shared.currencyKit, + currencyManager: App.shared.currencyManager, coinManager: App.shared.coinManager ) else { return nil diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/WalletConnectRequestModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/WalletConnectRequestModule.swift index b4d854dd35..6d9dc00871 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/WalletConnectRequestModule.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/Request/WalletConnectRequestModule.swift @@ -1,5 +1,4 @@ import RxCocoa -import CurrencyKit import EvmKit import BigInt import UIKit diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Extensions/ChartConfiguration.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Extensions/ChartConfiguration.swift index 3385e2868a..e33c3a70e8 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/Extensions/ChartConfiguration.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/Extensions/ChartConfiguration.swift @@ -1,7 +1,6 @@ import UIKit import Chart import LanguageKit -import CurrencyKit import ThemeKit extension ChartConfiguration { diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/ValueFormatter.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/ValueFormatter.swift index bb91570e00..93782b00f5 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/ValueFormatter.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/ValueFormatter.swift @@ -1,5 +1,4 @@ import Foundation -import CurrencyKit class ValueFormatter { static let instance = ValueFormatter()