diff --git a/.github/workflows/automated_integration_test.yml b/.github/workflows/automated_integration_test.yml index b299c9340..0869db8ea 100644 --- a/.github/workflows/automated_integration_test.yml +++ b/.github/workflows/automated_integration_test.yml @@ -190,7 +190,7 @@ jobs: echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml index 99dce1125..fbd40a4ef 100644 --- a/.github/workflows/pr_test_build_android.yml +++ b/.github/workflows/pr_test_build_android.yml @@ -135,7 +135,7 @@ jobs: echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml index d11625e0f..a9d8085b6 100644 --- a/.github/workflows/pr_test_build_linux.yml +++ b/.github/workflows/pr_test_build_linux.yml @@ -131,7 +131,7 @@ jobs: echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart index 8f5b4c64a..efc0f5d85 100644 --- a/lib/entities/default_settings_migration.dart +++ b/lib/entities/default_settings_migration.dart @@ -263,7 +263,7 @@ Future defaultSettingsMigration( case 41: _changeExchangeProviderAvailability( sharedPreferences, - providerName: "Quantex", + providerName: "SwapTrade", enabled: false, ); await _addSethNode(nodes, sharedPreferences); diff --git a/lib/exchange/exchange_provider_description.dart b/lib/exchange/exchange_provider_description.dart index 249ae61bf..048e5930f 100644 --- a/lib/exchange/exchange_provider_description.dart +++ b/lib/exchange/exchange_provider_description.dart @@ -26,8 +26,8 @@ class ExchangeProviderDescription extends EnumerableItem with Serializable< ExchangeProviderDescription(title: 'All trades', raw: 7, image: ''); static const thorChain = ExchangeProviderDescription(title: 'ThorChain', raw: 8, image: 'assets/images/thorchain.png'); - static const quantex = - ExchangeProviderDescription(title: 'Quantex', raw: 9, image: 'assets/images/quantex.png'); + static const swapTrade = + ExchangeProviderDescription(title: 'SwapTrade', raw: 9, image: 'assets/images/swapTrade.png'); static const letsExchange = ExchangeProviderDescription(title: 'LetsExchange', raw: 10, image: 'assets/images/letsexchange_icon.svg'); static const stealthEx = @@ -56,7 +56,7 @@ class ExchangeProviderDescription extends EnumerableItem with Serializable< case 8: return thorChain; case 9: - return quantex; + return swapTrade; case 10: return letsExchange; case 11: diff --git a/lib/exchange/provider/quantex_exchange_provider.dart b/lib/exchange/provider/swaptrade_exchange_provider.dart similarity index 96% rename from lib/exchange/provider/quantex_exchange_provider.dart rename to lib/exchange/provider/swaptrade_exchange_provider.dart index ee3473360..9553c9559 100644 --- a/lib/exchange/provider/quantex_exchange_provider.dart +++ b/lib/exchange/provider/swaptrade_exchange_provider.dart @@ -14,8 +14,8 @@ import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:http/http.dart'; -class QuantexExchangeProvider extends ExchangeProvider { - QuantexExchangeProvider() : super(pairList: supportedPairs(_notSupported)); +class SwapTradeExchangeProvider extends ExchangeProvider { + SwapTradeExchangeProvider() : super(pairList: supportedPairs(_notSupported)); static final List _notSupported = [ ...(CryptoCurrency.all @@ -33,15 +33,15 @@ class QuantexExchangeProvider extends ExchangeProvider { .toList()) ]; - static final markup = secrets.quantexExchangeMarkup; + static final markup = secrets.swapTradeExchangeMarkup; - static const apiAuthority = 'api.myquantex.com'; + static const apiAuthority = 'api.swaptrade.io'; static const getRate = '/api/swap/get-rate'; static const getCoins = '/api/swap/get-coins'; static const createOrder = '/api/swap/create-order'; @override - String get title => 'Quantex'; + String get title => 'SwapTrade'; @override bool get isAvailable => true; @@ -53,7 +53,7 @@ class QuantexExchangeProvider extends ExchangeProvider { bool get supportsFixedRate => false; @override - ExchangeProviderDescription get description => ExchangeProviderDescription.quantex; + ExchangeProviderDescription get description => ExchangeProviderDescription.swapTrade; @override Future checkIsAvailable() async => true; diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart index a5c855051..fd8c29f1f 100644 --- a/lib/view_model/exchange/exchange_trade_view_model.dart +++ b/lib/view_model/exchange/exchange_trade_view_model.dart @@ -5,7 +5,7 @@ import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart'; -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart'; +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart'; @@ -52,8 +52,8 @@ abstract class ExchangeTradeViewModelBase with Store { case ExchangeProviderDescription.exolix: _provider = ExolixExchangeProvider(); break; - case ExchangeProviderDescription.quantex: - _provider = QuantexExchangeProvider(); + case ExchangeProviderDescription.swapTrade: + _provider = SwapTradeExchangeProvider(); break; case ExchangeProviderDescription.stealthEx: _provider = StealthExExchangeProvider(); diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart index 72c482c93..f10860c7d 100644 --- a/lib/view_model/exchange/exchange_view_model.dart +++ b/lib/view_model/exchange/exchange_view_model.dart @@ -35,7 +35,7 @@ import 'package:cake_wallet/exchange/limits_state.dart'; import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart'; -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart'; +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart'; @@ -176,7 +176,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with ThorChainExchangeProvider(tradesStore: trades), ChainflipExchangeProvider(tradesStore: trades), if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(), - QuantexExchangeProvider(), + SwapTradeExchangeProvider(), LetsExchangeExchangeProvider(), StealthExExchangeProvider(), TrocadorExchangeProvider( diff --git a/lib/view_model/support_view_model.dart b/lib/view_model/support_view_model.dart index 69659916f..b7950dd9a 100644 --- a/lib/view_model/support_view_model.dart +++ b/lib/view_model/support_view_model.dart @@ -69,9 +69,9 @@ abstract class SupportViewModelBase with Store { linkTitle: 'support@exolix.com', link: 'mailto:support@exolix.com'), LinkListItem( - title: 'Quantex', - icon: 'assets/images/quantex.png', - linkTitle: 'help.myquantex.com', + title: 'SwapTrade', + icon: 'assets/images/swapTrade.png', + linkTitle: 'help.swaptrade.io', link: 'mailto:support@exolix.com'), LinkListItem( title: 'Trocador', diff --git a/lib/view_model/trade_details_view_model.dart b/lib/view_model/trade_details_view_model.dart index cb1a9d8ba..6b509dc22 100644 --- a/lib/view_model/trade_details_view_model.dart +++ b/lib/view_model/trade_details_view_model.dart @@ -6,7 +6,7 @@ import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/letsexchange_exchange_provider.dart'; -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart'; +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart'; @@ -61,8 +61,8 @@ abstract class TradeDetailsViewModelBase with Store { case ExchangeProviderDescription.thorChain: _provider = ThorChainExchangeProvider(tradesStore: trades); break; - case ExchangeProviderDescription.quantex: - _provider = QuantexExchangeProvider(); + case ExchangeProviderDescription.swapTrade: + _provider = SwapTradeExchangeProvider(); case ExchangeProviderDescription.letsExchange: _provider = LetsExchangeExchangeProvider(); break; @@ -96,8 +96,8 @@ abstract class TradeDetailsViewModelBase with Store { return 'https://exolix.com/transaction/${trade.id}'; case ExchangeProviderDescription.thorChain: return 'https://track.ninerealms.com/${trade.id}'; - case ExchangeProviderDescription.quantex: - return 'https://myquantex.com/send/${trade.id}'; + case ExchangeProviderDescription.swapTrade: + return 'https://swaptrade.io/send/${trade.id}'; case ExchangeProviderDescription.letsExchange: return 'https://letsexchange.io/?transactionId=${trade.id}'; case ExchangeProviderDescription.stealthEx: diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart index 76bbdc069..1c686a4ce 100644 --- a/tool/utils/secret_key.dart +++ b/tool/utils/secret_key.dart @@ -38,7 +38,7 @@ class SecretKey { SecretKey('moralisApiKey', () => ''), SecretKey('ankrApiKey', () => ''), SecretKey('chainStackApiKey', () => ''), - SecretKey('quantexExchangeMarkup', () => ''), + SecretKey('swapTradeExchangeMarkup', () => ''), SecretKey('seeds', () => ''), SecretKey('testCakePayApiKey', () => ''), SecretKey('cakePayApiKey', () => ''),