diff --git a/ios/Flutter/Default.xcconfig b/ios/Flutter/Default.xcconfig index 01c2c6d..121066e 100644 --- a/ios/Flutter/Default.xcconfig +++ b/ios/Flutter/Default.xcconfig @@ -1,3 +1 @@ -FLUTTER_WEB_AUTO_DETECT=true -FLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/04817c99c9fd4956f27505204f7e344335810aed/ FLUTTER_APP_FLAVOR=beta diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart index 9c6f66f..cb2dddd 100644 --- a/lib/firebase_options.dart +++ b/lib/firebase_options.dart @@ -2,20 +2,20 @@ import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; class DefaultFirebaseOptions { static const FirebaseOptions webStaging = FirebaseOptions( - apiKey: 'AIzaSyDnAB_UfQrBp_6RxBpn51s0BMfX3vV5a5U', - appId: '1:441627736227:web:c3f6f3ef5ec03f9ca66716', - messagingSenderId: '441627736227', - projectId: 'flutter-base-beta', - authDomain: 'flutter-base-beta.firebaseapp.com', - storageBucket: 'flutter-base-beta.appspot.com', + apiKey: 'AIzaSyD8-HkMTx3HhfSZ3mcfsIfwjwIU6bnhDeM', + authDomain: 'flutter-base-1e320.firebaseapp.com', + projectId: 'flutter-base-1e320', + storageBucket: 'flutter-base-1e320.appspot.com', + messagingSenderId: '426720039629', + appId: '1:426720039629:web:5f22b405b4923353fa0f84', ); static const FirebaseOptions webProd = FirebaseOptions( - apiKey: 'AIzaSyDnAB_UfQrBp_6RxBpn51s0BMfX3vV5a5U', - appId: '1:441627736227:web:c3f6f3ef5ec03f9ca66716', - messagingSenderId: '441627736227', - projectId: 'flutter-base-beta', - authDomain: 'flutter-base-beta.firebaseapp.com', - storageBucket: 'flutter-base-beta.appspot.com', + apiKey: 'AIzaSyB_Pw-tffIISl8HSD0Fx_xmTz4FA7oFAqo', + authDomain: 'flutter-base-live.firebaseapp.com', + projectId: 'flutter-base-live', + storageBucket: 'flutter-base-live.appspot.com', + messagingSenderId: '795134483527', + appId: '1:795134483527:web:01d7f2ac638dcad5fa6562', ); } diff --git a/lib/setup.dart b/lib/setup.dart index 95b5966..13e8200 100644 --- a/lib/setup.dart +++ b/lib/setup.dart @@ -23,12 +23,11 @@ void startApp({required FirebaseOptions? firebaseOptions}) async { options.environment = GetIt.I.get().environment; }, appRunner: () async { - final env = EnvVars().environment; final WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); await EasyLocalization.ensureInitialized(); - await Firebase.initializeApp(); + await Firebase.initializeApp(options: firebaseOptions); LicenseRegistry.addLicense(() async* { final poppinsLicense = @@ -36,6 +35,7 @@ void startApp({required FirebaseOptions? firebaseOptions}) async { yield LicenseEntryWithLineBreaks(['google_fonts'], poppinsLicense); }); + final env = EnvVars().environment; configureDependencies(env: env); final providerContainer = GetIt.I.get(); diff --git a/test/src/auth/presentation/pages/change_password_page_test.dart b/test/src/auth/presentation/pages/change_password_page_test.dart index 263d246..616b827 100644 --- a/test/src/auth/presentation/pages/change_password_page_test.dart +++ b/test/src/auth/presentation/pages/change_password_page_test.dart @@ -71,7 +71,7 @@ void main() { await tester.tap(button); await tester.pumpAndSettle(); - expectSnackBarWithMessage('Invalid password'); + expectSnackBar(); }, ); diff --git a/web/index.html b/web/index.html index 2933a71..2f67047 100644 --- a/web/index.html +++ b/web/index.html @@ -1,7 +1,7 @@ - - - + - - - + + + - - - - - + + + + + - - + + - tipead_clients - + Flutter base + - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + +