Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-14 23:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into CW-292-Save-historical-fiat-API-rate

Browse source
This commit is contained in:
Serhii 2023-06-11 14:33:50 +03:00
commit 5d6d9b9589
9 changed files with 516 additions and 436 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/pr_test_build.yml vendored
View file

@ -106,7 +106,6 @@ jobs:
echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
echo "const simpleSwapApiKeyDesktop = '${{ secrets.SIMPLE_SWAP_API_KEY_DESKTOP }}';" >> lib/.secrets.g.dart echo "const simpleSwapApiKeyDesktop = '${{ secrets.SIMPLE_SWAP_API_KEY_DESKTOP }}';" >> lib/.secrets.g.dart
echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart

192
lib/exchange/sideshift/sideshift_exchange_provider.dart
View file

@ -19,10 +19,10 @@ class SideShiftExchangeProvider extends ExchangeProvider {
static const affiliateId = secrets.sideShiftAffiliateId; static const affiliateId = secrets.sideShiftAffiliateId;
static const apiBaseUrl = 'https://sideshift.ai/api'; static const apiBaseUrl = 'https://sideshift.ai/api';
static const rangePath = '/v1/pairs'; static const rangePath = '/v2/pair';
static const orderPath = '/v1/orders'; static const orderPath = '/v2/shifts';
static const quotePath = '/v1/quotes'; static const quotePath = '/v2/quotes';
static const permissionPath = '/v1/permissions'; static const permissionPath = '/v2/permissions';
static const List<CryptoCurrency> _notSupported = [ static const List<CryptoCurrency> _notSupported = [
CryptoCurrency.xhv, CryptoCurrency.xhv,
@ -36,23 +36,22 @@ class SideShiftExchangeProvider extends ExchangeProvider {
CryptoCurrency.scrt, CryptoCurrency.scrt,
CryptoCurrency.stx, CryptoCurrency.stx,
CryptoCurrency.bttc, CryptoCurrency.bttc,
CryptoCurrency.usdt,
CryptoCurrency.eos,
]; ];
static List<ExchangePair> _supportedPairs() { static List<ExchangePair> _supportedPairs() {
final supportedCurrencies = CryptoCurrency.all final supportedCurrencies =
.where((element) => !_notSupported.contains(element)) CryptoCurrency.all.where((element) => !_notSupported.contains(element)).toList();
.toList();
return supportedCurrencies return supportedCurrencies
.map((i) => supportedCurrencies .map((i) => supportedCurrencies.map((k) => ExchangePair(from: i, to: k, reverse: true)))
.map((k) => ExchangePair(from: i, to: k, reverse: true)))
.expand((i) => i) .expand((i) => i)
.toList(); .toList();
} }
@override @override
ExchangeProviderDescription get description => ExchangeProviderDescription get description => ExchangeProviderDescription.sideShift;
ExchangeProviderDescription.sideShift;
@override @override
Future<double> fetchRate( Future<double> fetchRate(
@ -65,17 +64,18 @@ class SideShiftExchangeProvider extends ExchangeProvider {
if (amount == 0) { if (amount == 0) {
return 0.0; return 0.0;
} }
final fromCurrency = _normalizeCryptoCurrency(from);
final toCurrency = _normalizeCryptoCurrency(to); final fromCurrency = from.title.toLowerCase();
final url = final toCurrency = to.title.toLowerCase();
apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency; final depositNetwork = _networkFor(from);
final settleNetwork = _networkFor(to);
final url = "$apiBaseUrl$rangePath/$fromCurrency-$depositNetwork/$toCurrency-$settleNetwork";
final uri = Uri.parse(url); final uri = Uri.parse(url);
final response = await get(uri); final response = await get(uri);
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final rate = double.parse(responseJSON['rate'] as String); final rate = double.parse(responseJSON['rate'] as String);
final max = double.parse(responseJSON['max'] as String);
if (amount > max) return 0.00;
return rate; return rate;
} catch (_) { } catch (_) {
@ -101,25 +101,38 @@ class SideShiftExchangeProvider extends ExchangeProvider {
} }
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final canCreateOrder = responseJSON['createOrder'] as bool; final cancreateShift = responseJSON['createShift'] as bool;
final canCreateQuote = responseJSON['createQuote'] as bool; return cancreateShift;
return canCreateOrder && canCreateQuote;
} }
@override @override
Future<Trade> createTrade( Future<Trade> createTrade({required TradeRequest request, required bool isFixedRateMode}) async {
{required TradeRequest request, required bool isFixedRateMode}) async {
final _request = request as SideShiftRequest; final _request = request as SideShiftRequest;
final quoteId = await _createQuote(_request); String url = '';
final url = apiBaseUrl + orderPath; final depositCoin = request.depositMethod.title.toLowerCase();
final headers = {'Content-Type': 'application/json'}; final settleCoin = request.settleMethod.title.toLowerCase();
final body = { final body = {
'type': 'fixed',
'quoteId': quoteId,
'affiliateId': affiliateId, 'affiliateId': affiliateId,
'settleAddress': _request.settleAddress, 'settleAddress': _request.settleAddress,
'refundAddress': _request.refundAddress 'refundAddress': _request.refundAddress,
}; };
if (isFixedRateMode) {
final quoteId = await _createQuote(_request);
body['quoteId'] = quoteId;
url = apiBaseUrl + orderPath + '/fixed';
} else {
url = apiBaseUrl + orderPath + '/variable';
final depositNetwork = _networkFor(request.depositMethod);
final settleNetwork = _networkFor(request.settleMethod);
body["depositCoin"] = depositCoin;
body["settleCoin"] = settleCoin;
body["settleNetwork"] = settleNetwork;
body["depositNetwork"] = depositNetwork;
}
final headers = {'Content-Type': 'application/json'};
final uri = Uri.parse(url); final uri = Uri.parse(url);
final response = await post(uri, headers: headers, body: json.encode(body)); final response = await post(uri, headers: headers, body: json.encode(body));
@ -136,8 +149,9 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final id = responseJSON['id'] as String; final id = responseJSON['id'] as String;
final inputAddress = responseJSON['depositAddress']['address'] as String; final inputAddress = responseJSON['depositAddress'] as String;
final settleAddress = responseJSON['settleAddress']['address'] as String; final settleAddress = responseJSON['settleAddress'] as String;
final depositAmount = responseJSON['depositAmount'] as String?;
return Trade( return Trade(
id: id, id: id,
@ -147,7 +161,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
inputAddress: inputAddress, inputAddress: inputAddress,
refundAddress: settleAddress, refundAddress: settleAddress,
state: TradeState.created, state: TradeState.created,
amount: _request.depositAmount, amount: depositAmount ?? _request.depositAmount,
payoutAddress: settleAddress, payoutAddress: settleAddress,
createdAt: DateTime.now(), createdAt: DateTime.now(),
); );
@ -156,13 +170,17 @@ class SideShiftExchangeProvider extends ExchangeProvider {
Future<String> _createQuote(SideShiftRequest request) async { Future<String> _createQuote(SideShiftRequest request) async {
final url = apiBaseUrl + quotePath; final url = apiBaseUrl + quotePath;
final headers = {'Content-Type': 'application/json'}; final headers = {'Content-Type': 'application/json'};
final depositMethod = _normalizeCryptoCurrency(request.depositMethod); final depositMethod = request.depositMethod.title.toLowerCase();
final settleMethod = _normalizeCryptoCurrency(request.settleMethod); final settleMethod = request.settleMethod.title.toLowerCase();
final depositNetwork = _networkFor(request.depositMethod);
final settleNetwork = _networkFor(request.settleMethod);
final body = { final body = {
'depositMethod': depositMethod, 'depositCoin': depositMethod,
'settleMethod': settleMethod, 'settleCoin': settleMethod,
'affiliateId': affiliateId, 'affiliateId': affiliateId,
'depositAmount': request.depositAmount, 'settleAmount': request.depositAmount,
'settleNetwork': settleNetwork,
'depositNetwork': depositNetwork,
}; };
final uri = Uri.parse(url); final uri = Uri.parse(url);
final response = await post(uri, headers: headers, body: json.encode(body)); final response = await post(uri, headers: headers, body: json.encode(body));
@ -189,9 +207,15 @@ class SideShiftExchangeProvider extends ExchangeProvider {
{required CryptoCurrency from, {required CryptoCurrency from,
required CryptoCurrency to, required CryptoCurrency to,
required bool isFixedRateMode}) async { required bool isFixedRateMode}) async {
final fromCurrency = _normalizeCryptoCurrency(from); final fromCurrency = isFixedRateMode ? to : from;
final toCurrency = _normalizeCryptoCurrency(to); final toCurrency = isFixedRateMode ? from : to;
final url = apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency;
final fromNetwork = _networkFor(fromCurrency);
final toNetwork = _networkFor(toCurrency);
final url =
"$apiBaseUrl$rangePath/${fromCurrency.title.toLowerCase()}-$fromNetwork/${toCurrency.title.toLowerCase()}-$toNetwork";
final uri = Uri.parse(url); final uri = Uri.parse(url);
final response = await get(uri); final response = await get(uri);
@ -210,6 +234,14 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final min = double.tryParse(responseJSON['min'] as String? ?? ''); final min = double.tryParse(responseJSON['min'] as String? ?? '');
final max = double.tryParse(responseJSON['max'] as String? ?? ''); final max = double.tryParse(responseJSON['max'] as String? ?? '');
if (isFixedRateMode) {
final currentRate = double.parse(responseJSON['rate'] as String);
return Limits(
min: min != null ? (min * currentRate) : null,
max: max != null ? (max * currentRate) : null,
);
}
return Limits(min: min, max: max); return Limits(min: min, max: max);
} }
@ -227,8 +259,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final error = responseJSON['error']['message'] as String; final error = responseJSON['error']['message'] as String;
throw TradeNotFoundException(id, throw TradeNotFoundException(id, provider: description, description: error);
provider: description, description: error);
} }
if (response.statusCode != 200) { if (response.statusCode != 200) {
@ -236,36 +267,32 @@ class SideShiftExchangeProvider extends ExchangeProvider {
} }
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final fromCurrency = responseJSON['depositMethodId'] as String; final fromCurrency = responseJSON['depositCoin'] as String;
final from = CryptoCurrency.fromString(fromCurrency); final from = CryptoCurrency.fromString(fromCurrency);
final toCurrency = responseJSON['settleMethodId'] as String; final toCurrency = responseJSON['settleCoin'] as String;
final to = CryptoCurrency.fromString(toCurrency); final to = CryptoCurrency.fromString(toCurrency);
final inputAddress = responseJSON['depositAddress']['address'] as String; final inputAddress = responseJSON['depositAddress'] as String;
final expectedSendAmount = responseJSON['depositAmount'].toString(); final expectedSendAmount = responseJSON['depositAmount'] as String?;
final deposits = responseJSON['deposits'] as List?; final status = responseJSON['status'] as String?;
final settleAddress = responseJSON['settleAddress']['address'] as String; final settleAddress = responseJSON['settleAddress'] as String;
TradeState? state; TradeState? state;
String? status;
if (deposits?.isNotEmpty ?? false) {
status = deposits![0]['status'] as String?;
}
state = TradeState.deserialize(raw: status ?? 'created'); state = TradeState.deserialize(raw: status ?? 'created');
final isVariable = (responseJSON['type'] as String) == 'variable';
final expiredAtRaw = responseJSON['expiresAtISO'] as String; final expiredAtRaw = responseJSON['expiresAt'] as String;
final expiredAt = DateTime.tryParse(expiredAtRaw)?.toLocal(); final expiredAt = isVariable ? null : DateTime.tryParse(expiredAtRaw)?.toLocal();
return Trade( return Trade(
id: id, id: id,
from: from, from: from,
to: to, to: to,
provider: description, provider: description,
inputAddress: inputAddress, inputAddress: inputAddress,
amount: expectedSendAmount, amount: expectedSendAmount ?? '',
state: state, state: state,
expiredAt: expiredAt, expiredAt: expiredAt,
payoutAddress: settleAddress payoutAddress: settleAddress);
);
} }
@override @override
@ -280,28 +307,25 @@ class SideShiftExchangeProvider extends ExchangeProvider {
@override @override
String get title => 'SideShift'; String get title => 'SideShift';
static String _normalizeCryptoCurrency(CryptoCurrency currency) { String _networkFor(CryptoCurrency currency) =>
switch (currency) { currency.tag != null ? _normalizeTag(currency.tag!) : 'mainnet';
case CryptoCurrency.zaddr:
return 'zaddr'; String _normalizeTag(String tag) {
case CryptoCurrency.zec: switch (tag) {
return 'zec'; case 'ETH':
case CryptoCurrency.bnb: return 'ethereum';
return currency.tag!.toLowerCase(); case 'TRX':
case CryptoCurrency.usdterc20: return 'tron';
return 'usdtErc20'; case 'LN':
case CryptoCurrency.usdttrc20: return 'lightning';
return 'usdtTrc20'; case 'POLY':
case CryptoCurrency.usdcpoly:
return 'usdcpolygon';
case CryptoCurrency.usdcsol:
return 'usdcsol';
case CryptoCurrency.maticpoly:
return 'polygon'; return 'polygon';
case CryptoCurrency.btcln: case 'ZEC':
return 'ln'; return 'zcash';
case 'AVAXC':
return 'avax';
default: default:
return currency.title.toLowerCase(); return tag.toLowerCase();
} }
} }
} }

166
lib/src/screens/dashboard/widgets/transactions_page.dart
View file

@ -26,26 +26,31 @@ class TransactionsPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return GestureDetector(
color: ResponsiveLayoutUtil.instance.isMobile(context) onLongPress: () => dashboardViewModel.balanceViewModel.isReversing =
? null !dashboardViewModel.balanceViewModel.isReversing,
: Theme.of(context).colorScheme.background, onLongPressUp: () => dashboardViewModel.balanceViewModel.isReversing =
padding: EdgeInsets.only(top: 24, bottom: 24), !dashboardViewModel.balanceViewModel.isReversing,
child: Column( child: Container(
children: <Widget>[ color: ResponsiveLayoutUtil.instance.isMobile(context)
HeaderRow(dashboardViewModel: dashboardViewModel), ? null
Expanded(child: Observer(builder: (_) { : Theme.of(context).colorScheme.background,
final items = dashboardViewModel.items; padding: EdgeInsets.only(top: 24, bottom: 24),
child: Column(
children: <Widget>[
HeaderRow(dashboardViewModel: dashboardViewModel),
Expanded(child: Observer(builder: (_) {
final items = dashboardViewModel.items;
return items.isNotEmpty return items.isNotEmpty
? ListView.builder( ? ListView.builder(
itemCount: items.length, itemCount: items.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final item = items[index]; final item = items[index];
if (item is DateSectionItem) { if (item is DateSectionItem) {
return DateSectionRaw(date: item.date); return DateSectionRaw(date: item.date);
} }
if (item is TransactionListItem) { if (item is TransactionListItem) {
final transaction = item.transaction; final transaction = item.transaction;
@ -75,68 +80,79 @@ class TransactionsPage extends StatelessWidget {
title: item.formattedTitle + item.formattedStatus)); title: item.formattedTitle + item.formattedStatus));
} }
if (item is AnonpayTransactionListItem) { if (item is AnonpayTransactionListItem) {
final transactionInfo = item.transaction; final transactionInfo = item.transaction;
return AnonpayTransactionRow( return AnonpayTransactionRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context).pushNamed(
.pushNamed(Routes.anonPayDetailsPage, arguments: transactionInfo), Routes.anonPayDetailsPage,
currency: transactionInfo.fiatAmount != null arguments: transactionInfo),
? transactionInfo.fiatEquiv ?? '' currency: transactionInfo.fiatAmount != null
: CryptoCurrency.fromFullName(transactionInfo.coinTo) ? transactionInfo.fiatEquiv ?? ''
.name : CryptoCurrency.fromFullName(
.toUpperCase(), transactionInfo.coinTo)
provider: transactionInfo.provider, .name
amount: transactionInfo.fiatAmount?.toString() ?? .toUpperCase(),
(transactionInfo.amountTo?.toString() ?? ''), provider: transactionInfo.provider,
createdAt: DateFormat('HH:mm').format(transactionInfo.createdAt), amount: transactionInfo.fiatAmount?.toString() ??
); (transactionInfo.amountTo?.toString() ?? ''),
} createdAt: DateFormat('HH:mm')
.format(transactionInfo.createdAt),
);
}
if (item is TradeListItem) { if (item is TradeListItem) {
final trade = item.trade; final trade = item.trade;
return Observer( return Observer(
builder: (_) => TradeRow( builder: (_) => TradeRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context).pushNamed(
.pushNamed(Routes.tradeDetails, arguments: trade), Routes.tradeDetails,
provider: trade.provider, arguments: trade),
from: trade.from, provider: trade.provider,
to: trade.to, from: trade.from,
createdAtFormattedDate: trade.createdAt != null to: trade.to,
? DateFormat('HH:mm').format(trade.createdAt!)
: null,
formattedAmount: item.tradeFormattedAmount));
}
if (item is OrderListItem) {
final order = item.order;
return Observer(
builder: (_) => OrderRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.orderDetails, arguments: order),
provider: order.provider,
from: order.from!,
to: order.to!,
createdAtFormattedDate: createdAtFormattedDate:
DateFormat('HH:mm').format(order.createdAt), trade.createdAt != null
formattedAmount: item.orderFormattedAmount, ? DateFormat('HH:mm')
)); .format(trade.createdAt!)
} : null,
formattedAmount: item.tradeFormattedAmount));
}
return Container(color: Colors.transparent, height: 1); if (item is OrderListItem) {
}) final order = item.order;
: Center(
child: Text( return Observer(
S.of(context).placeholder_transactions, builder: (_) => OrderRow(
style: TextStyle( onTap: () => Navigator.of(context)
fontSize: 14, .pushNamed(Routes.orderDetails,
color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!), arguments: order),
), provider: order.provider,
); from: order.from!,
})) to: order.to!,
], createdAtFormattedDate: DateFormat('HH:mm')
.format(order.createdAt),
formattedAmount: item.orderFormattedAmount,
));
}
return Container(color: Colors.transparent, height: 1);
})
: Center(
child: Text(
S.of(context).placeholder_transactions,
style: TextStyle(
fontSize: 14,
color: Theme.of(context)
.primaryTextTheme
.labelSmall!
.decorationColor!),
),
);
}))
],
),
), ),
); );
} }

528
lib/src/screens/send/send_page.dart
View file

@ -145,216 +145,247 @@ class SendPage extends BasePage {
Widget body(BuildContext context) { Widget body(BuildContext context) {
_setEffects(context); _setEffects(context);
return Form( return GestureDetector(
key: _formKey, onLongPress: () => sendViewModel.balanceViewModel.isReversing =
child: ScrollableWithBottomSection( !sendViewModel.balanceViewModel.isReversing,
contentPadding: EdgeInsets.only(bottom: 24), onLongPressUp: () => sendViewModel.balanceViewModel.isReversing =
content: FocusTraversalGroup( !sendViewModel.balanceViewModel.isReversing,
policy: OrderedTraversalPolicy(), child: Form(
child: Column( key: _formKey,
children: <Widget>[ child: ScrollableWithBottomSection(
Container( contentPadding: EdgeInsets.only(bottom: 24),
height: _sendCardHeight(context), content: FocusTraversalGroup(
child: Observer( policy: OrderedTraversalPolicy(),
builder: (_) { child: Column(
return PageView.builder( children: <Widget>[
scrollDirection: Axis.horizontal, Container(
controller: controller, height: _sendCardHeight(context),
itemCount: sendViewModel.outputs.length, child: Observer(
itemBuilder: (context, index) { builder: (_) {
final output = sendViewModel.outputs[index]; return PageView.builder(
scrollDirection: Axis.horizontal,
controller: controller,
itemCount: sendViewModel.outputs.length,
itemBuilder: (context, index) {
final output = sendViewModel.outputs[index];
return SendCard( return SendCard(
key: output.key, key: output.key,
output: output, output: output,
sendViewModel: sendViewModel, sendViewModel: sendViewModel,
initialPaymentRequest: initialPaymentRequest, initialPaymentRequest: initialPaymentRequest,
); );
}); });
}, },
)), )),
Padding( Padding(
padding: padding: EdgeInsets.only(
EdgeInsets.only(top: 10, left: 24, right: 24, bottom: 10), top: 10, left: 24, right: 24, bottom: 10),
child: Container( child: Container(
height: 10, height: 10,
child: Observer( child: Observer(
builder: (_) { builder: (_) {
final count = sendViewModel.outputs.length; final count = sendViewModel.outputs.length;
return count > 1 return count > 1
? SmoothPageIndicator( ? SmoothPageIndicator(
controller: controller, controller: controller,
count: count, count: count,
effect: ScrollingDotsEffect( effect: ScrollingDotsEffect(
spacing: 6.0, spacing: 6.0,
radius: 6.0, radius: 6.0,
dotWidth: 6.0, dotWidth: 6.0,
dotHeight: 6.0, dotHeight: 6.0,
dotColor: Theme.of(context) dotColor: Theme.of(context)
.primaryTextTheme!.displaySmall! .primaryTextTheme
.backgroundColor!, !.displaySmall!
activeDotColor: Theme.of(context) .backgroundColor!,
.primaryTextTheme!.displayMedium! activeDotColor: Theme.of(context)
.backgroundColor!), .primaryTextTheme
) !.displayMedium!
: Offstage(); .backgroundColor!),
}, )
: Offstage();
},
),
), ),
), ),
), if (sendViewModel.hasMultiRecipient)
if (sendViewModel.hasMultiRecipient) Container(
Container( height: 40,
height: 40, width: double.infinity,
width: double.infinity, padding: EdgeInsets.only(left: 24),
padding: EdgeInsets.only(left: 24), child: SingleChildScrollView(
child: SingleChildScrollView( scrollDirection: Axis.horizontal,
scrollDirection: Axis.horizontal, child: Observer(
child: Observer( builder: (_) {
builder: (_) { final templates = sendViewModel.templates;
final templates = sendViewModel.templates; final itemCount = templates.length;
final itemCount = templates.length;
return Row( return Row(
children: <Widget>[ children: <Widget>[
AddTemplateButton( AddTemplateButton(
onTap: () => Navigator.of(context).pushNamed(Routes.sendTemplate), onTap: () => Navigator.of(context)
currentTemplatesLength: templates.length, .pushNamed(Routes.sendTemplate),
), currentTemplatesLength: templates.length,
ListView.builder( ),
scrollDirection: Axis.horizontal, ListView.builder(
shrinkWrap: true, scrollDirection: Axis.horizontal,
physics: NeverScrollableScrollPhysics(), shrinkWrap: true,
itemCount: itemCount, physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) { itemCount: itemCount,
final template = templates[index]; itemBuilder: (context, index) {
return TemplateTile( final template = templates[index];
key: UniqueKey(), return TemplateTile(
to: template.name, key: UniqueKey(),
amount: template.isCurrencySelected ? template.amount : template.amountFiat, to: template.name,
from: template.isCurrencySelected ? template.cryptoCurrency : template.fiatCurrency, amount: template.isCurrencySelected
onTap: () async { ? template.amount
final fiatFromTemplate = FiatCurrency.all.singleWhere((element) => element.title == template.fiatCurrency); : template.amountFiat,
final output = _defineCurrentOutput(); from: template.isCurrencySelected
output.address = template.address; ? template.cryptoCurrency
if(template.isCurrencySelected){ : template.fiatCurrency,
output.setCryptoAmount(template.amount); onTap: () async {
}else{ final fiatFromTemplate = FiatCurrency
sendViewModel.setFiatCurrency(fiatFromTemplate); .all
output.setFiatAmount(template.amountFiat); .singleWhere((element) =>
} element.title ==
output.resetParsedAddress(); template.fiatCurrency);
await output.fetchParsedAddress(context); final output = _defineCurrentOutput();
}, output.address = template.address;
onRemove: () { if (template.isCurrencySelected) {
showPopUp<void>( output
context: context, .setCryptoAmount(template.amount);
builder: (dialogContext) { } else {
return AlertWithTwoActions( sendViewModel.setFiatCurrency(
alertTitle: S.of(context).template, fiatFromTemplate);
alertContent: S output.setFiatAmount(
.of(context) template.amountFiat);
.confirm_delete_template, }
rightButtonText: S.of(context).delete, output.resetParsedAddress();
leftButtonText: S.of(context).cancel, await output
actionRightButton: () { .fetchParsedAddress(context);
Navigator.of(dialogContext).pop(); },
sendViewModel.sendTemplateViewModel onRemove: () {
.removeTemplate( showPopUp<void>(
template: template); context: context,
}, builder: (dialogContext) {
actionLeftButton: () => return AlertWithTwoActions(
Navigator.of(dialogContext) alertTitle:
.pop()); S.of(context).template,
alertContent: S
.of(context)
.confirm_delete_template,
rightButtonText:
S.of(context).delete,
leftButtonText:
S.of(context).cancel,
actionRightButton: () {
Navigator.of(dialogContext)
.pop();
sendViewModel
.sendTemplateViewModel
.removeTemplate(
template: template);
},
actionLeftButton: () =>
Navigator.of(dialogContext)
.pop());
},
);
}, },
); );
}, },
); ),
}, ],
), );
], },
); ),
}, ),
),
),
)
],
),
),
bottomSectionPadding:
EdgeInsets.only(left: 24, right: 24, bottom: 24),
bottomSection: Column(
children: [
if (sendViewModel.hasCurrecyChanger)
Observer(builder: (_) =>
Padding(
padding: EdgeInsets.only(bottom: 12),
child: PrimaryButton(
onPressed: () => presentCurrencyPicker(context),
text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})',
color: Colors.transparent,
textColor: Theme.of(context)
.accentTextTheme!.displaySmall!
.decorationColor!,
) )
) ],
), ),
if (sendViewModel.hasMultiRecipient) ),
Padding( bottomSectionPadding:
padding: EdgeInsets.only(bottom: 12), EdgeInsets.only(left: 24, right: 24, bottom: 24),
child: PrimaryButton( bottomSection: Column(
onPressed: () { children: [
sendViewModel.addOutput(); if (sendViewModel.hasCurrecyChanger)
Future.delayed(const Duration(milliseconds: 250), () { Observer(
controller.jumpToPage(sendViewModel.outputs.length - 1); builder: (_) => Padding(
}); padding: EdgeInsets.only(bottom: 12),
}, child: PrimaryButton(
text: S.of(context).add_receiver, onPressed: () => presentCurrencyPicker(context),
color: Colors.transparent, text:
textColor: Theme.of(context) 'Change your asset (${sendViewModel.selectedCryptoCurrency})',
.accentTextTheme!.displaySmall! color: Colors.transparent,
.decorationColor!, textColor: Theme.of(context)
isDottedBorder: true, .accentTextTheme
borderColor: Theme.of(context) !.displaySmall!
.primaryTextTheme!.displaySmall! .decorationColor!,
.decorationColor!, ))),
)), if (sendViewModel.hasMultiRecipient)
Observer( Padding(
builder: (_) { padding: EdgeInsets.only(bottom: 12),
return LoadingPrimaryButton( child: PrimaryButton(
onPressed: () async { onPressed: () {
if (_formKey.currentState != null && !_formKey.currentState!.validate()) { sendViewModel.addOutput();
if (sendViewModel.outputs.length > 1) { Future.delayed(const Duration(milliseconds: 250), () {
showErrorValidationAlert(context); controller
.jumpToPage(sendViewModel.outputs.length - 1);
});
},
text: S.of(context).add_receiver,
color: Colors.transparent,
textColor: Theme.of(context)
.accentTextTheme
!.displaySmall!
.decorationColor!,
isDottedBorder: true,
borderColor: Theme.of(context)
.primaryTextTheme
!.displaySmall!
.decorationColor!,
)),
Observer(
builder: (_) {
return LoadingPrimaryButton(
onPressed: () async {
if (_formKey.currentState != null &&
!_formKey.currentState!.validate()) {
if (sendViewModel.outputs.length > 1) {
showErrorValidationAlert(context);
}
return;
} }
return; final notValidItems = sendViewModel.outputs
} .where((item) =>
item.address.isEmpty ||
item.cryptoAmount.isEmpty)
.toList();
final notValidItems = sendViewModel.outputs if (notValidItems.isNotEmpty ?? false) {
.where((item) => showErrorValidationAlert(context);
item.address.isEmpty || item.cryptoAmount.isEmpty) return;
.toList(); }
if (notValidItems.isNotEmpty ?? false) { await sendViewModel.createTransaction();
showErrorValidationAlert(context); },
return; text: S.of(context).send,
} color:
Theme.of(context).accentTextTheme!.bodyLarge!.color!,
await sendViewModel.createTransaction(); textColor: Colors.white,
isLoading: sendViewModel.state is IsExecutingState ||
}, sendViewModel.state is TransactionCommitting,
text: S.of(context).send, isDisabled: !sendViewModel.isReadyForSend,
color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, );
textColor: Colors.white, },
isLoading: sendViewModel.state is IsExecutingState || )
sendViewModel.state is TransactionCommitting, ],
isDisabled: !sendViewModel.isReadyForSend, )),
); ),
},
)
],
)),
); );
} }
@ -382,51 +413,54 @@ class SendPage extends BasePage {
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (context.mounted) { if (context.mounted) {
showPopUp<void>( showPopUp<void>(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return ConfirmSendingAlert( return ConfirmSendingAlert(
alertTitle: S.of(context).confirm_sending, alertTitle: S.of(context).confirm_sending,
amount: S.of(context).send_amount, amount: S.of(context).send_amount,
amountValue: amountValue:
sendViewModel.pendingTransaction!.amountFormatted, sendViewModel.pendingTransaction!.amountFormatted,
fiatAmountValue: sendViewModel.pendingTransactionFiatAmountFormatted, fiatAmountValue:
fee: S.of(context).send_fee, sendViewModel.pendingTransactionFiatAmountFormatted,
feeValue: sendViewModel.pendingTransaction!.feeFormatted, fee: S.of(context).send_fee,
feeFiatAmount: sendViewModel.pendingTransactionFeeFiatAmountFormatted, feeValue: sendViewModel.pendingTransaction!.feeFormatted,
outputs: sendViewModel.outputs, feeFiatAmount: sendViewModel
rightButtonText: S.of(context).ok, .pendingTransactionFeeFiatAmountFormatted,
leftButtonText: S.of(context).cancel, outputs: sendViewModel.outputs,
actionRightButton: () { rightButtonText: S.of(context).ok,
Navigator.of(context).pop(); leftButtonText: S.of(context).cancel,
sendViewModel.commitTransaction(); actionRightButton: () {
showPopUp<void>( Navigator.of(context).pop();
context: context, sendViewModel.commitTransaction();
builder: (BuildContext context) { showPopUp<void>(
return Observer(builder: (_) { context: context,
final state = sendViewModel.state; builder: (BuildContext context) {
return Observer(builder: (_) {
final state = sendViewModel.state;
if (state is FailureState) { if (state is FailureState) {
Navigator.of(context).pop(); Navigator.of(context).pop();
}
if (state is TransactionCommitted) {
return AlertWithOneAction(
alertTitle: '',
alertContent: S.of(context).send_success(
sendViewModel.selectedCryptoCurrency.toString()),
buttonText: S.of(context).ok,
buttonAction: () {
Navigator.of(context).pop();
RequestReviewHandler.requestReview();
});
} }
return Offstage(); if (state is TransactionCommitted) {
return AlertWithOneAction(
alertTitle: '',
alertContent: S.of(context).send_success(
sendViewModel.selectedCryptoCurrency
.toString()),
buttonText: S.of(context).ok,
buttonAction: () {
Navigator.of(context).pop();
RequestReviewHandler.requestReview();
});
}
return Offstage();
});
}); });
}); },
}, actionLeftButton: () => Navigator.of(context).pop());
actionLeftButton: () => Navigator.of(context).pop()); });
});
} }
}); });
} }
@ -461,16 +495,18 @@ class SendPage extends BasePage {
}); });
} }
void presentCurrencyPicker(BuildContext context) async { void presentCurrencyPicker(BuildContext context) async {
await showPopUp<CryptoCurrency>( await showPopUp<CryptoCurrency>(
builder: (_) => Picker( builder: (_) => Picker(
items: sendViewModel.currencies, items: sendViewModel.currencies,
displayItem: (Object item) => item.toString(), displayItem: (Object item) => item.toString(),
selectedAtIndex: sendViewModel.currencies.indexOf(sendViewModel.selectedCryptoCurrency), selectedAtIndex: sendViewModel.currencies
title: S.of(context).please_select, .indexOf(sendViewModel.selectedCryptoCurrency),
mainAxisAlignment: MainAxisAlignment.center, title: S.of(context).please_select,
onItemSelected: (CryptoCurrency cur) => sendViewModel.selectedCryptoCurrency = cur, mainAxisAlignment: MainAxisAlignment.center,
), onItemSelected: (CryptoCurrency cur) =>
sendViewModel.selectedCryptoCurrency = cur,
),
context: context); context: context);
} }
} }

40
lib/src/screens/wallet_list/wallet_list_page.dart
View file

@ -149,12 +149,26 @@ class WalletListBodyState extends State<WalletListBody> {
return wallet.isCurrent return wallet.isCurrent
? row ? row
: Slidable( : Row(children: [
key: Key('${wallet.key}'), Expanded(child: row),
startActionPane: _actionPane(wallet), GestureDetector(
endActionPane: _actionPane(wallet), onTap: () => _removeWallet(wallet),
child: row, child: Container(
); height: 40,
width: 44,
padding: EdgeInsets.only(right: 20),
child: Center(
child: Image.asset('assets/images/trash.png',
height: 16,
width: 16,
color: Theme.of(context)
.primaryTextTheme
.titleLarge!
.color),
),
),
)
]);
}), }),
), ),
), ),
@ -277,18 +291,4 @@ class WalletListBodyState extends State<WalletListBody> {
_progressBar = null; _progressBar = null;
}); });
} }
ActionPane _actionPane(WalletListItem wallet) => ActionPane(
motion: const ScrollMotion(),
extentRatio: 0.3,
children: [
SlidableAction(
onPressed: (_) => _removeWallet(wallet),
backgroundColor: Colors.red,
foregroundColor: Colors.white,
icon: CupertinoIcons.delete,
label: S.of(context).delete,
),
],
);
} }

3
lib/view_model/dashboard/transaction_list_item.dart
View file

@ -13,7 +13,6 @@ import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
import 'package:cw_core/keyable.dart'; import 'package:cw_core/keyable.dart';
import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/wallet_type.dart';
class TransactionListItem extends ActionListItem with Keyable { class TransactionListItem extends ActionListItem with Keyable {
TransactionListItem( TransactionListItem(
{required this.transaction, {required this.transaction,
@ -28,7 +27,7 @@ class TransactionListItem extends ActionListItem with Keyable {
FiatCurrency get fiatCurrency => settingsStore.fiatCurrency; FiatCurrency get fiatCurrency => settingsStore.fiatCurrency;
BalanceDisplayMode get displayMode => settingsStore.balanceDisplayMode; BalanceDisplayMode get displayMode => balanceViewModel.displayMode;
@override @override
dynamic get keyIndex => transaction.id; dynamic get keyIndex => transaction.id;

9
lib/view_model/exchange/exchange_trade_view_model.dart
View file

@ -47,7 +47,7 @@ abstract class ExchangeTradeViewModelBase with Store {
case ExchangeProviderDescription.simpleSwap: case ExchangeProviderDescription.simpleSwap:
_provider = SimpleSwapExchangeProvider(); _provider = SimpleSwapExchangeProvider();
break; break;
case ExchangeProviderDescription.trocador: case ExchangeProviderDescription.trocador:
_provider = TrocadorExchangeProvider(); _provider = TrocadorExchangeProvider();
break; break;
} }
@ -114,6 +114,10 @@ abstract class ExchangeTradeViewModelBase with Store {
updatedTrade.createdAt = trade.createdAt; updatedTrade.createdAt = trade.createdAt;
} }
if (updatedTrade.amount.isEmpty) {
updatedTrade.amount = trade.amount;
}
trade = updatedTrade; trade = updatedTrade;
_updateItems(); _updateItems();
@ -123,7 +127,8 @@ abstract class ExchangeTradeViewModelBase with Store {
} }
void _updateItems() { void _updateItems() {
final tagFrom = tradesStore.trade!.from.tag != null ? '${tradesStore.trade!.from.tag}' + ' ' : ''; final tagFrom =
tradesStore.trade!.from.tag != null ? '${tradesStore.trade!.from.tag}' + ' ' : '';
final tagTo = tradesStore.trade!.to.tag != null ? '${tradesStore.trade!.to.tag}' + ' ' : ''; final tagTo = tradesStore.trade!.to.tag != null ? '${tradesStore.trade!.to.tag}' + ' ' : '';
items.clear(); items.clear();
items.add(ExchangeTradeItem( items.add(ExchangeTradeItem(

4
lib/view_model/exchange/exchange_view_model.dart
View file

@ -443,7 +443,9 @@ abstract class ExchangeViewModelBase with Store {
request = SideShiftRequest( request = SideShiftRequest(
depositMethod: depositCurrency, depositMethod: depositCurrency,
settleMethod: receiveCurrency, settleMethod: receiveCurrency,
depositAmount: depositAmount.replaceAll(',', '.'), depositAmount: isFixedRateMode
? receiveAmount.replaceAll(',', '.')
: depositAmount.replaceAll(',', '.'),
settleAddress: receiveAddress, settleAddress: receiveAddress,
refundAddress: depositAddress, refundAddress: depositAddress,
); );

1
tool/utils/secret_key.dart
View file

@ -20,7 +20,6 @@ class SecretKey {
SecretKey('moonPayApiKey', () => ''), SecretKey('moonPayApiKey', () => ''),
SecretKey('moonPaySecretKey', () => ''), SecretKey('moonPaySecretKey', () => ''),
SecretKey('sideShiftAffiliateId', () => ''), SecretKey('sideShiftAffiliateId', () => ''),
SecretKey('sideShiftApiKey', () => ''),
SecretKey('simpleSwapApiKey', () => ''), SecretKey('simpleSwapApiKey', () => ''),
SecretKey('simpleSwapApiKeyDesktop', () => ''), SecretKey('simpleSwapApiKeyDesktop', () => ''),
SecretKey('anypayToken', () => ''), SecretKey('anypayToken', () => ''),