Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-11-16 17:27:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into CWA-153-changenow-cryptocurrencies

Browse source 
# Conflicts:
#	.gitignore
#	lib/src/stores/address_book/address_book_store.dart
#	lib/src/stores/exchange/exchange_store.dart
#	lib/src/stores/send/send_store.dart
#	lib/src/stores/wallet_restoration/wallet_restoration_store.dart
This commit is contained in:
Oleksandr Sobol 2020-01-10 21:46:32 +02:00
commit aba0aede28
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/node_list.yml
View file

@ -14,7 +14,7 @@
uri: node.xmr.pt:18081
is_default: false
-
uri: node.xmr.ru:13666
uri: node.monero.net:18081
is_default: false
-
uri: opennode.xmr-tw.org:18089

3
lib/src/domain/common/default_settings_migration.dart
View file

@ -65,7 +65,8 @@ Future<void> replaceNodesMigration({@required Box<Node> nodes}) async {
'eu-node.cakewallet.io:18081':
Node(uri: 'xmr-node-eu.cakewallet.com:18081'),
'node.cakewallet.io:18081':
Node(uri: 'xmr-node-usa-east.cakewallet.com:18081')
Node(uri: 'xmr-node-usa-east.cakewallet.com:18081'),
'node.xmr.ru:13666': Node(uri: 'node.monero.net:18081')
};
nodes.values.forEach((Node node) async {

2
lib/src/domain/common/fetch_price.dart
View file

@ -21,7 +21,7 @@ Future<double> fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async {
}
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
final data = responseJSON['data'] as List<Map<String, dynamic>>;
final data = responseJSON['data'] as List<dynamic>;
for (final item in data) {
if (item['symbol'] == cryptoToString(crypto)) {

5
lib/src/screens/settings/change_language.dart
View file

@ -29,6 +29,9 @@ class ChangeLanguage extends BasePage {
final settingsStore = Provider.of<SettingsStore>(context);
final currentLanguage = Provider.of<Language>(context);
final currentColor = Theme.of(context).selectedRowColor;
final notCurrentColor = Theme.of(context).accentTextTheme.subhead.backgroundColor;
return Container(
padding: EdgeInsets.only(top: 10.0, bottom: 10.0),
child: ListView.builder(
@ -41,7 +44,7 @@ class ChangeLanguage extends BasePage {
return Container(
margin: EdgeInsets.only(top: 10.0, bottom: 10.0),
color: Theme.of(context).accentTextTheme.subhead.backgroundColor,
color: isCurrent ? currentColor : notCurrentColor,
child: ListTile(
title: Text(
_languages.values.elementAt(index),

4
lib/src/screens/settings/settings.dart
View file

@ -53,7 +53,7 @@ class SettingsFormState extends State<SettingsForm> {
final _xmrBtcImage = Image.asset('assets/images/xmr_btc.png');
final _emailUrl = 'mailto:support@cakewallet.io';
final _telegramUrl = 'https:t.me/cake_wallet';
final _telegramUrl = 'https:t.me/cakewallet_bot';
final _twitterUrl = 'https:twitter.com/CakewalletXMR';
final _changeNowUrl = 'mailto:support@changenow.io';
final _xmrToUrl = 'mailto:support@xmr.to';
@ -246,7 +246,7 @@ class SettingsFormState extends State<SettingsForm> {
SettingsItem(
onTaped: () => _launchUrl(_telegramUrl),
title: 'Telegram',
link: 't.me/cake_wallet',
link: 't.me/cakewallet_bot',
image: _telegramImage,
attribute: Attributes.link),
SettingsItem(