diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart index f31aa53e..8b4176d4 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-details.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart @@ -286,7 +286,7 @@ class _CovidPaymentDetailsState extends State { minWidth: MediaQuery.of(context).size.width * 0.7, height: 45.0, child: RaisedButton( - color: CustomColors.darkGreyColor, + color: CustomColors.accentColor, textColor: Colors.white, elevation: 0, disabledTextColor: Colors.white, @@ -295,11 +295,11 @@ class _CovidPaymentDetailsState extends State { cancel(); }, child: Text( - TranslationBase.of(context).cancel, + TranslationBase.of(context).cancel_nocaps, style: TextStyle( fontSize: 16.0, letterSpacing: -0.48, - color: Colors.black, + color: Colors.white, fontWeight: FontWeight.w600, ), ), @@ -318,7 +318,7 @@ class _CovidPaymentDetailsState extends State { minWidth: MediaQuery.of(context).size.width * 0.7, height: 45.0, child: RaisedButton( - color: CustomColors.accentColor, + color: CustomColors.green, textColor: Colors.white, elevation: 0, disabledTextColor: Colors.white, diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index c9f4e9c6..d23b91b2 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -146,7 +146,7 @@ class Utils { } String loginIDPattern(loginType) { - var length = loginType == 1 ? 10 : 6; + var length = loginType == 1 ? 10 : 4; return "([0-9]{" + length.toString() + "})"; }