diff --git a/recipients_app/lib/view/pages/account_page.dart b/recipients_app/lib/view/pages/account_page.dart index 09fa3a725..4f838bc5c 100644 --- a/recipients_app/lib/view/pages/account_page.dart +++ b/recipients_app/lib/view/pages/account_page.dart @@ -104,6 +104,9 @@ class AccountPageState extends State { Widget build(BuildContext context) { final localizations = AppLocalizations.of(context)!; + final recipient = + context.watch().state.recipient ?? widget.recipient; + return BlocConsumer( listener: (context, state) { if (state.status == AuthStatus.updateRecipientSuccess) { @@ -151,7 +154,7 @@ class AccountPageState extends State { onSubmitted: (value) { if (value != null && value.isNotEmpty) context.read().updateRecipient( - widget.recipient.copyWith(firstName: value), + recipient.copyWith(firstName: value), ); }, ), @@ -168,7 +171,7 @@ class AccountPageState extends State { onSubmitted: (value) { if (value != null && value.isNotEmpty) context.read().updateRecipient( - widget.recipient.copyWith( + recipient.copyWith( lastName: value, ), ); @@ -180,7 +183,7 @@ class AccountPageState extends State { hintText: localizations.callingName, onSubmitted: (value) => context.read().updateRecipient( - widget.recipient.copyWith(callingName: value), + recipient.copyWith(callingName: value), ), ), const SizedBox(height: 16), @@ -200,7 +203,7 @@ class AccountPageState extends State { value: "other", ), ], - value: widget.recipient.gender, + value: recipient.gender, validator: (value) { if (value == null || value.isEmpty) { return localizations.genderError; @@ -209,7 +212,7 @@ class AccountPageState extends State { }, onChanged: (value) => context.read().updateRecipient( - widget.recipient.copyWith( + recipient.copyWith( gender: value, ), ), @@ -223,14 +226,14 @@ class AccountPageState extends State { firstDate: DateTime(1950), lastDate: DateTime(DateTime.now().year - 10), initialDate: - widget.recipient.birthDate?.toDate() ?? DateTime(2000), + recipient.birthDate?.toDate() ?? DateTime(2000), context: context, ).then((value) { if (value != null) { final timestamp = Timestamp.fromDate(value); context.read().updateRecipient( - widget.recipient.copyWith( + recipient.copyWith( birthDate: timestamp, ), ); @@ -273,10 +276,10 @@ class AccountPageState extends State { // change language accordingly context.read().changeLanguage(value!); context.read().updateRecipient( - widget.recipient.copyWith(selectedLanguage: value), + recipient.copyWith(selectedLanguage: value), ); }, - value: widget.recipient.selectedLanguage, + value: recipient.selectedLanguage, ), const SizedBox(height: 16), @@ -286,7 +289,7 @@ class AccountPageState extends State { onSubmitted: (value) { if (value != null && value.isNotEmpty) context.read().updateRecipient( - widget.recipient.copyWith(email: value), + recipient.copyWith(email: value), ); }, keyboardType: TextInputType.emailAddress, @@ -305,7 +308,7 @@ class AccountPageState extends State { onSubmitted: (value) { if (value != null && value.isNotEmpty) { context.read().updateRecipient( - widget.recipient.copyWith( + recipient.copyWith( mobileMoneyPhone: Phone(int.parse(value)), ), ); @@ -336,7 +339,7 @@ class AccountPageState extends State { value: "africell_money", ), ], - value: widget.recipient.paymentProvider, + value: recipient.paymentProvider, validator: (value) { if (value == null || value.isEmpty) { return localizations.paymentProviderError; @@ -346,7 +349,7 @@ class AccountPageState extends State { onChanged: (value) => context .read() .updateRecipient( - widget.recipient.copyWith(paymentProvider: value)), + recipient.copyWith(paymentProvider: value)), ), const SizedBox(height: 24), @@ -374,7 +377,7 @@ class AccountPageState extends State { onSubmitted: (value) { if (value != null && value.isNotEmpty) context.read().updateRecipient( - widget.recipient.copyWith( + recipient.copyWith( communicationMobilePhone: Phone( int.parse(value), ), @@ -411,7 +414,10 @@ class AccountPageState extends State { Text(localizations.supportInfo), const SizedBox(height: 16), ButtonBig( - onPressed: () => const SocialIncomeContactDialog(), + onPressed: () => showDialog( + context: context, + builder: (context) => const SocialIncomeContactDialog(), + ), label: localizations.getInTouch, ), const SizedBox(height: 24), diff --git a/recipients_app/lib/view/widgets/dialogs/social_income_contact_dialog.dart b/recipients_app/lib/view/widgets/dialogs/social_income_contact_dialog.dart index 0f5008b4c..d86184ece 100644 --- a/recipients_app/lib/view/widgets/dialogs/social_income_contact_dialog.dart +++ b/recipients_app/lib/view/widgets/dialogs/social_income_contact_dialog.dart @@ -20,9 +20,6 @@ class SocialIncomeContactDialog extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(AppSizes.radiusMedium), color: AppColors.backgroundColor, - border: Border.all( - color: Theme.of(context).primaryColor, - ), ), child: Padding( padding: AppSpacings.a16, @@ -38,11 +35,11 @@ class SocialIncomeContactDialog extends StatelessWidget { ), Text( localizations.supportTeam, - style: const TextStyle(fontSize: 24), + style: Theme.of(context).textTheme.headlineLarge, ), Text( localizations.getInTouch, - style: const TextStyle(fontSize: 15, color: Colors.grey), + style: Theme.of(context).textTheme.bodyLarge, ) ], ), @@ -50,7 +47,7 @@ class SocialIncomeContactDialog extends StatelessWidget { children: [ _IconAndContact( contactMethod: "WhatsApp", - contactDetails: "+41 76 251 55 69", + contactDetails: "+232 75 588647", onOpen: (String value) => openWhatsapp(context, value), ), const SizedBox(height: 16), @@ -62,7 +59,7 @@ class SocialIncomeContactDialog extends StatelessWidget { const SizedBox(height: 16), _IconAndContact( contactMethod: localizations.email, - contactDetails: "support@socialincome.org", + contactDetails: "hello@socialincome.org", onOpen: (String value) => writeEmail(value), ), ],