diff --git a/assets/node_list.yml b/assets/node_list.yml index 90c09e0b..9e9de82a 100644 --- a/assets/node_list.yml +++ b/assets/node_list.yml @@ -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 diff --git a/lib/src/domain/common/default_settings_migration.dart b/lib/src/domain/common/default_settings_migration.dart index 82d91924..37fc1d5b 100644 --- a/lib/src/domain/common/default_settings_migration.dart +++ b/lib/src/domain/common/default_settings_migration.dart @@ -65,7 +65,8 @@ Future replaceNodesMigration({@required Box 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 { diff --git a/lib/src/domain/common/fetch_price.dart b/lib/src/domain/common/fetch_price.dart index 34957aa7..36f996f7 100644 --- a/lib/src/domain/common/fetch_price.dart +++ b/lib/src/domain/common/fetch_price.dart @@ -21,7 +21,7 @@ Future fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async { } final responseJSON = json.decode(response.body) as Map; - final data = responseJSON['data'] as List>; + final data = responseJSON['data'] as List; for (final item in data) { if (item['symbol'] == cryptoToString(crypto)) { diff --git a/lib/src/screens/settings/change_language.dart b/lib/src/screens/settings/change_language.dart index cdadeb58..da59a370 100644 --- a/lib/src/screens/settings/change_language.dart +++ b/lib/src/screens/settings/change_language.dart @@ -29,6 +29,9 @@ class ChangeLanguage extends BasePage { final settingsStore = Provider.of(context); final currentLanguage = Provider.of(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), diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart index 7a3eb9fe..72602c4d 100644 --- a/lib/src/screens/settings/settings.dart +++ b/lib/src/screens/settings/settings.dart @@ -53,7 +53,7 @@ class SettingsFormState extends State { 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 { SettingsItem( onTaped: () => _launchUrl(_telegramUrl), title: 'Telegram', - link: 't.me/cake_wallet', + link: 't.me/cakewallet_bot', image: _telegramImage, attribute: Attributes.link), SettingsItem(