Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 19:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CAKE-284 | added static function defineUrlForCalculatingAmount() to changenow_exchange_provider.dart; fixed FAQ in the support_view_model.dart

Browse source
This commit is contained in:
OleksandrSobol 2021-03-01 20:16:28 +02:00
parent 5b242002d1
commit 6245dfe885
3 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
lib/exchange/changenow/changenow_exchange_provider.dart
View file

@ -158,30 +158,17 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
? DateTime.parse(expiredAtRaw).toLocal() ? DateTime.parse(expiredAtRaw).toLocal()
: null; : null;
if (expiredAt != null) { 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, extraId: extraId,
extraId: extraId, expiredAt: expiredAt,
expiredAt: expiredAt, outputTransaction: outputTransaction);
outputTransaction: outputTransaction);
} else {
return Trade(
id: id,
from: from,
to: to,
provider: description,
inputAddress: inputAddress,
amount: expectedSendAmount,
state: state,
extraId: extraId,
outputTransaction: outputTransaction);
}
} }
@override @override
@ -215,23 +202,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
return estimatedAmount; return estimatedAmount;
} else { } else {
final url = isFixedRateMode final url = defineUrlForCalculatingAmount(from, to, amount, isFixedRateMode);
? apiUri +
_exchangeAmountUriSufix +
_fixedRateUriSufix +
amount.toString() +
'/' +
from.toString() +
'_' +
to.toString() +
'?api_key=' + apiKey
: apiUri +
_exchangeAmountUriSufix +
amount.toString() +
'/' +
from.toString() +
'_' +
to.toString();
final response = await get(url); final response = await get(url);
final responseJSON = json.decode(response.body) as Map<String, dynamic>; final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final estimatedAmount = responseJSON['estimatedAmount'] as double; final estimatedAmount = responseJSON['estimatedAmount'] as double;
@ -239,4 +210,28 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
return estimatedAmount; return estimatedAmount;
} }
} }
static String defineUrlForCalculatingAmount(
CryptoCurrency from,
CryptoCurrency to,
double amount,
bool isFixedRateMode) {
return isFixedRateMode
? apiUri +
_exchangeAmountUriSufix +
_fixedRateUriSufix +
amount.toString() +
'/' +
from.toString() +
'_' +
to.toString() +
'?api_key=' + apiKey
: apiUri +
_exchangeAmountUriSufix +
amount.toString() +
'/' +
from.toString() +
'_' +
to.toString();
}
} }

1
lib/view_model/settings/settings_view_model.dart
View file

@ -20,7 +20,6 @@ import 'package:cake_wallet/entities/node.dart';
import 'package:cake_wallet/entities/monero_transaction_priority.dart'; import 'package:cake_wallet/entities/monero_transaction_priority.dart';
import 'package:cake_wallet/entities/action_list_display_mode.dart'; import 'package:cake_wallet/entities/action_list_display_mode.dart';
import 'package:cake_wallet/view_model/settings/version_list_item.dart'; import 'package:cake_wallet/view_model/settings/version_list_item.dart';
import 'package:cake_wallet/view_model/settings/link_list_item.dart';
import 'package:cake_wallet/view_model/settings/picker_list_item.dart'; import 'package:cake_wallet/view_model/settings/picker_list_item.dart';
import 'package:cake_wallet/view_model/settings/regular_list_item.dart'; import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
import 'package:cake_wallet/view_model/settings/settings_list_item.dart'; import 'package:cake_wallet/view_model/settings/settings_list_item.dart';

8
lib/view_model/support_view_model.dart
View file

@ -6,6 +6,7 @@ import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:url_launcher/url_launcher.dart';
part 'support_view_model.g.dart'; part 'support_view_model.g.dart';
@ -16,8 +17,9 @@ abstract class SupportViewModelBase with Store {
items = [ items = [
RegularListItem( RegularListItem(
title: S.current.faq, title: S.current.faq,
handler: (BuildContext context) => handler: (BuildContext context) async {
Navigator.pushNamed(context, Routes.faq), if (await canLaunch(url)) await launch(url);
},
), ),
LinkListItem( LinkListItem(
title: 'Email', title: 'Email',
@ -40,5 +42,7 @@ abstract class SupportViewModelBase with Store {
link: 'mailto:support@changenow.io') link: 'mailto:support@changenow.io')
]; ];
} }
static const url = 'https://cakewallet.com/guide/';
List<SettingsListItem> items; List<SettingsListItem> items;
} }