diff --git a/lib/modules/signup/providers/group_provider.dart b/lib/modules/signup/providers/group_provider.dart index b26dcd9c..e833618e 100644 --- a/lib/modules/signup/providers/group_provider.dart +++ b/lib/modules/signup/providers/group_provider.dart @@ -1,6 +1,7 @@ import 'dart:convert'; -import 'package:http/http.dart' as http; +// import 'package:http/http.dart' as http; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/modules/signup/models/group_model.dart'; import 'package:test_sa/providers/loading_list_notifier.dart'; @@ -19,10 +20,12 @@ class AssetGroupProvider extends LoadingListNotifier { 'X-Timezone-Offset': DateTime.now().timeZoneOffset.toString().split(".").first, }; - final response = await http.get( - Uri.parse(URLs.signUpGetAssetGroups), - headers: headers, - ); + // final response = await http.get( + // Uri.parse(URLs.signUpGetAssetGroups), + // headers: headers, + // ); + + var response = await ApiManager.instance.get(URLs.signUpGetAssetGroups); stateCode = response.statusCode; diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 6e51f0cb..0a020cbb 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -249,11 +249,11 @@ class _LoginPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - "Don't have an account? ".bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral50), + "Don't have an account? ".bodyText(context).custom(color: AppColor.textStyleColor(context)), "Sign Up".bodyText(context).custom(color: AppColor.primary10, fontWeight: FontWeight.w600).onPress(() { Navigator.pushNamed(context, SignUpScreen.routeName); }), - " or ".bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral50), + " OR ".bodyText(context).custom(color: AppColor.textStyleColor(context)), "Request a Demo".bodyText(context).custom(color: AppColor.primary10, fontWeight: FontWeight.w600).onPress(() { Navigator.pushNamed(context, ApplicationDemoRequestFormScreen.routeName); }),