github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-24 06:48:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
parent debca3c888 53aedc8188
commit aba0aede28
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/settings/change_language.dart
+4 -1
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),
lib/src/screens/settings/settings.dart
+2 -2
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(