ef377fb53 · samitouri/QOSAMI-cakewallet-1

.github/workflows/automated_integration_test.yml

+1 -1

@@ -190,7 +190,7 @@ jobs:

190 echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart

191 echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart

192 echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart

193 - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

193 + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

194 echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

195 echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

196 echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart

.github/workflows/pr_test_build_android.yml

+1 -1

@@ -135,7 +135,7 @@ jobs:

135 echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart

136 echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart

137 echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart

138 - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

138 + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

139 echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

140 echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

141 echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart

.github/workflows/pr_test_build_linux.yml

+1 -1

@@ -131,7 +131,7 @@ jobs:

131 echo "const cakePayApiKey = '${{ secrets.CAKE_PAY_API_KEY }}';" >> lib/.secrets.g.dart

132 echo "const authorization = '${{ secrets.CAKE_PAY_AUTHORIZATION }}';" >> lib/.secrets.g.dart

133 echo "const CSRFToken = '${{ secrets.CSRF_TOKEN }}';" >> lib/.secrets.g.dart

134 - echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

134 + echo "const swapTradeExchangeMarkup = '${{ secrets.SWAPTRADE_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart

135 echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

136 echo "const nanoNowNodesApiKey = '${{ secrets.NANO_NOW_NODES_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart

137 echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart

lib/entities/default_settings_migration.dart

+1 -1

@@ -263,7 +263,7 @@ Future<void> defaultSettingsMigration(

263 case 41:

264 _changeExchangeProviderAvailability(

265 sharedPreferences,

266 - providerName: "Quantex",

266 + providerName: "SwapTrade",

267 enabled: false,

268 );

269 await _addSethNode(nodes, sharedPreferences);

lib/exchange/exchange_provider_description.dart

+3 -3

@@ -26,8 +26,8 @@ class ExchangeProviderDescription extends EnumerableItem<int> with Serializable<

26 ExchangeProviderDescription(title: 'All trades', raw: 7, image: '');

27 static const thorChain =

28 ExchangeProviderDescription(title: 'ThorChain', raw: 8, image: 'assets/images/thorchain.png');

29 - static const quantex =

30 - ExchangeProviderDescription(title: 'Quantex', raw: 9, image: 'assets/images/quantex.png');

29 + static const swapTrade =

30 + ExchangeProviderDescription(title: 'SwapTrade', raw: 9, image: 'assets/images/swapTrade.png');

31 static const letsExchange =

32 ExchangeProviderDescription(title: 'LetsExchange', raw: 10, image: 'assets/images/letsexchange_icon.svg');

33 static const stealthEx =

@@ -56,7 +56,7 @@ class ExchangeProviderDescription extends EnumerableItem<int> with Serializable<

56 case 8:

57 return thorChain;

58 case 9:

59 - return quantex;

59 + return swapTrade;

60 case 10:

61 return letsExchange;

62 case 11:

lib/exchange/provider/swaptrade_exchange_provider.dart renamed

+6 -6

@@ -14,8 +14,8 @@ import 'package:cw_core/crypto_currency.dart';

14 import 'package:cw_core/utils/print_verbose.dart';

15 import 'package:http/http.dart';

16

17 -class QuantexExchangeProvider extends ExchangeProvider {

18 - QuantexExchangeProvider() : super(pairList: supportedPairs(_notSupported));

17 +class SwapTradeExchangeProvider extends ExchangeProvider {

18 + SwapTradeExchangeProvider() : super(pairList: supportedPairs(_notSupported));

19

20 static final List<CryptoCurrency> _notSupported = [

21 ...(CryptoCurrency.all

@@ -33,15 +33,15 @@ class QuantexExchangeProvider extends ExchangeProvider {

33 .toList())

34 ];

35

36 - static final markup = secrets.quantexExchangeMarkup;

36 + static final markup = secrets.swapTradeExchangeMarkup;

37

38 - static const apiAuthority = 'api.myquantex.com';

38 + static const apiAuthority = 'api.swaptrade.io';

39 static const getRate = '/api/swap/get-rate';

40 static const getCoins = '/api/swap/get-coins';

41 static const createOrder = '/api/swap/create-order';

42

43 @override

44 - String get title => 'Quantex';

44 + String get title => 'SwapTrade';

45

46 @override

47 bool get isAvailable => true;

@@ -53,7 +53,7 @@ class QuantexExchangeProvider extends ExchangeProvider {

53 bool get supportsFixedRate => false;

54

55 @override

56 - ExchangeProviderDescription get description => ExchangeProviderDescription.quantex;

56 + ExchangeProviderDescription get description => ExchangeProviderDescription.swapTrade;

57

58 @override

59 Future<bool> checkIsAvailable() async => true;

lib/view_model/exchange/exchange_trade_view_model.dart

+3 -3

@@ -5,7 +5,7 @@ import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart';

5 import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';

6 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';

7 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';

8 -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';

8 +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart';

9 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';

10 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';

11 import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart';

@@ -52,8 +52,8 @@ abstract class ExchangeTradeViewModelBase with Store {

52 case ExchangeProviderDescription.exolix:

53 _provider = ExolixExchangeProvider();

54 break;

55 - case ExchangeProviderDescription.quantex:

56 - _provider = QuantexExchangeProvider();

55 + case ExchangeProviderDescription.swapTrade:

56 + _provider = SwapTradeExchangeProvider();

57 break;

58 case ExchangeProviderDescription.stealthEx:

59 _provider = StealthExExchangeProvider();

lib/view_model/exchange/exchange_view_model.dart

+2 -2

@@ -35,7 +35,7 @@ import 'package:cake_wallet/exchange/limits_state.dart';

35 import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';

36 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';

37 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';

38 -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';

38 +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart';

39 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';

40 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';

41 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';

@@ -176,7 +176,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with

176 ThorChainExchangeProvider(tradesStore: trades),

177 ChainflipExchangeProvider(tradesStore: trades),

178 if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),

179 - QuantexExchangeProvider(),

179 + SwapTradeExchangeProvider(),

180 LetsExchangeExchangeProvider(),

181 StealthExExchangeProvider(),

182 TrocadorExchangeProvider(

lib/view_model/support_view_model.dart

+3 -3

@@ -69,9 +69,9 @@ abstract class SupportViewModelBase with Store {

69 linkTitle: 'support@exolix.com',

70 link: 'mailto:support@exolix.com'),

71 LinkListItem(

72 - title: 'Quantex',

73 - icon: 'assets/images/quantex.png',

74 - linkTitle: 'help.myquantex.com',

72 + title: 'SwapTrade',

73 + icon: 'assets/images/swapTrade.png',

74 + linkTitle: 'help.swaptrade.io',

75 link: 'mailto:support@exolix.com'),

76 LinkListItem(

77 title: 'Trocador',

lib/view_model/trade_details_view_model.dart

+5 -5

@@ -6,7 +6,7 @@ import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';

6 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';

7 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';

8 import 'package:cake_wallet/exchange/provider/letsexchange_exchange_provider.dart';

9 -import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';

9 +import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart';

10 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';

11 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';

12 import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart';

@@ -61,8 +61,8 @@ abstract class TradeDetailsViewModelBase with Store {

61 case ExchangeProviderDescription.thorChain:

62 _provider = ThorChainExchangeProvider(tradesStore: trades);

63 break;

64 - case ExchangeProviderDescription.quantex:

65 - _provider = QuantexExchangeProvider();

64 + case ExchangeProviderDescription.swapTrade:

65 + _provider = SwapTradeExchangeProvider();

66 case ExchangeProviderDescription.letsExchange:

67 _provider = LetsExchangeExchangeProvider();

68 break;

@@ -96,8 +96,8 @@ abstract class TradeDetailsViewModelBase with Store {

96 return 'https://exolix.com/transaction/${trade.id}';

97 case ExchangeProviderDescription.thorChain:

98 return 'https://track.ninerealms.com/${trade.id}';

99 - case ExchangeProviderDescription.quantex:

100 - return 'https://myquantex.com/send/${trade.id}';

99 + case ExchangeProviderDescription.swapTrade:

100 + return 'https://swaptrade.io/send/${trade.id}';

101 case ExchangeProviderDescription.letsExchange:

102 return 'https://letsexchange.io/?transactionId=${trade.id}';

103 case ExchangeProviderDescription.stealthEx:

tool/utils/secret_key.dart

+1 -1

@@ -38,7 +38,7 @@ class SecretKey {

38 SecretKey('moralisApiKey', () => ''),

39 SecretKey('ankrApiKey', () => ''),

40 SecretKey('chainStackApiKey', () => ''),

41 - SecretKey('quantexExchangeMarkup', () => ''),

41 + SecretKey('swapTradeExchangeMarkup', () => ''),

42 SecretKey('seeds', () => ''),

43 SecretKey('testCakePayApiKey', () => ''),

44 SecretKey('cakePayApiKey', () => ''),

Change Quantex to SwapTrade (#1990)