From 07b25a7b5f5b287d67b87ff45a3182bc4a733b3b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 27 May 2020 21:03:16 +0300 Subject: [PATCH] Fix button text color on login page w/light mode --- lib/data/mock/mock_login.dart | 2 +- lib/data/models/invoice_model.dart | 4 +++- lib/ui/auth/login_view.dart | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/data/mock/mock_login.dart b/lib/data/mock/mock_login.dart index 3d295a379..c62bb98fb 100644 --- a/lib/data/mock/mock_login.dart +++ b/lib/data/mock/mock_login.dart @@ -96,7 +96,7 @@ const dynamic kMockLogin = ''' "custom_value3": "", "custom_value4": "", "default_task_rate": 0, - "payment_terms": 1, + "payment_terms": "1", "send_reminders": false, "custom_message_dashboard": "", "custom_message_unpaid_invoice": "", diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 2de0bf402..a908729af 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -548,7 +548,9 @@ abstract class InvoiceEntity extends Object if (!isQuote && !isCredit && isSent) { actions.add(EntityAction.cancel); - actions.add(EntityAction.reverse); + if (userCompany.company.isModuleEnabled(EntityType.credit)) { + actions.add(EntityAction.reverse); + } } if (isQuote && !isApproved) { diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart index 6cea9d1e2..0aa47e437 100644 --- a/lib/ui/auth/login_view.dart +++ b/lib/ui/auth/login_view.dart @@ -573,7 +573,7 @@ class _LoginState extends State { mainAxisSize: MainAxisSize.min, children: [ if (_emailLogin) - Icon(Icons.mail) + Icon(Icons.mail, color: Colors.white) else ClipOval( child: Image.asset( @@ -590,7 +590,8 @@ class _LoginState extends State { : (_emailLogin ? localization.emailSignIn : localization.googleSignIn), - style: TextStyle(fontSize: 18), + style: + TextStyle(fontSize: 18, color: Colors.white), ) ], ),