6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 17e8286b
Changed files
comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart | 4 ++-- comwell_key_app/lib/home/home_page.dart | 2 +- comwell_key_app/lib/pregistration/components/add_card.dart | 6 ++++-- comwell_key_app/lib/routing/app_router.dart | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-)
Diff
diff --git a/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart b/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
index f69bab35..e57cc3ad 100644
--- a/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
+++ b/comwell_key_app/lib/.generated/services/adyen/adyen_amount.g.dart
@@ -7,8 +7,8 @@ part of '../../../services/adyen/adyen_amount.dart';
// **************************************************************************
AdyenAmount _$AdyenAmountFromJson(Map<String, dynamic> json) => AdyenAmount(
- json['currency'] as String,
- (json['value'] as num).toInt(),
+ currency: json['currency'] as String,
+ value: (json['value'] as num).toInt(),
);
Map<String, dynamic> _$AdyenAmountToJson(AdyenAmount instance) =>
diff --git a/comwell_key_app/lib/home/home_page.dart b/comwell_key_app/lib/home/home_page.dart
index 06a36c13..c7d354a1 100644
--- a/comwell_key_app/lib/home/home_page.dart
+++ b/comwell_key_app/lib/home/home_page.dart
@@ -121,7 +121,7 @@ class _HomeWidget extends State<HomeWidget> {
const SizedBox(height: 400),
ElevatedButton(
onPressed: () {
- context.push(AppRoutes.preregistration.name);
+ context.pushNamed(AppRoutes.preregistration.name);
},
style: ButtonStyle(
backgroundColor:
diff --git a/comwell_key_app/lib/pregistration/components/add_card.dart b/comwell_key_app/lib/pregistration/components/add_card.dart
index 64d4e652..2e315a00 100644
--- a/comwell_key_app/lib/pregistration/components/add_card.dart
+++ b/comwell_key_app/lib/pregistration/components/add_card.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
import 'package:adyen_checkout/adyen_checkout.dart';
import 'package:comwell_key_app/pregistration/bloc/preregistration_cubit.dart';
import 'package:comwell_key_app/pregistration/models/add_card_payment_method.dart';
@@ -22,8 +24,8 @@ class AddCard extends StatelessWidget {
final config = CardComponentConfiguration(
environment: Environment.test,
clientKey: dotenv.env['ADYEN_CLIENT_KEY']!,
- countryCode: "DK",
- shopperLocale: "da-DK",
+ countryCode: Locale(Platform.localeName).languageCode,
+ shopperLocale: Platform.localeName,
cardConfiguration:
const CardConfiguration(showStorePaymentField: true));
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index 31f11afa..1b311b3f 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -135,10 +135,10 @@ GoRouter goRouter(AuthenticationBloc authBloc) {
name: AppRoutes.redeem.name,
builder: (context, state) => const RedeemPage(),
),
- GoRoute(path: "/prereg",
+ GoRoute(
+ path: "/${AppRoutes.preregistration.name}",
name: AppRoutes.preregistration.name,
- builder: (context,
- state) {
+ builder: (context, state) {
return const PreregistrationFlow();
}),