added android logo assets

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
+  <background android:drawable="@mipmap/ic_launcher_background"/>
   <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,4 +0,0 @@
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,3 +0,0 @@
-<resources>
-  <color name="ic_launcher_background">#ffffff</color>
-</resources>

lib/screens/pay/pay_controller.dart

@@ -20,6 +20,7 @@ class PayScreenModel {
   PaymentProcessor? selectedPaymentProcessor;
   String region = '';
   bool isLoading = false;
+  bool isLoadingProducts = false;
   String? errorMessage;
   String? status;
 }
@@ -146,7 +147,7 @@ class PayController extends ChangeNotifier {
 
   Future<ApiResponse<List<BillProduct>>> getProducts(String providerId) async {
     try {
-      model.isLoading = true;
+      model.isLoadingProducts = true;
       notifyListeners();
 
       List<dynamic> response = await http.get(
@@ -154,12 +155,12 @@ class PayController extends ChangeNotifier {
       );
       model.products = response.map((e) => BillProduct.fromJson(e)).toList();
 
-      model.isLoading = false;
+      model.isLoadingProducts = false;
       notifyListeners();
       return ApiResponse.success(model.products);
     } catch (e) {
       logger.e(e);
-      model.isLoading = false;
+      model.isLoadingProducts = false;
       notifyListeners();
       return ApiResponse.failure(
         "Problem fetching products, are you connected to the internet?",

lib/screens/pay/pay_screen.dart

@@ -298,9 +298,7 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
                                 if (showAdditionalRecipientDetails)
                                   _buildAdditionalRecipientDetails(),
                                 const SizedBox(height: 7),
-                                if (controller.model.products.isNotEmpty ||
+                                _buildBillProductSelector(controller),
-                                    controller.model.isLoading)
-                                  _buildBillProductSelector(controller),
                                 const SizedBox(height: 7),
                                 _buildPhoneField(),
                                 const SizedBox(height: 7),
@@ -364,8 +362,9 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Row(
+            Column(
               children: [
                 const Text(
                   'Debit Phone Number',
@@ -607,6 +606,31 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
   }
 
   Widget _buildBillProductSelector(PayController controller) {
+    if (controller.model.products.isEmpty && !controller.model.isLoadingProducts) {
+      return SizedBox.shrink();
+    }
+
+    if (controller.model.isLoadingProducts) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(height: 20),
+          const Text(
+            'Provider Product',
+            style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
+          ),
+          const SizedBox(height: 5),
+          Container(
+            height: 50,
+            decoration: BoxDecoration(
+              color: Colors.grey.shade300,
+              borderRadius: BorderRadius.circular(12),
+            ),
+          ),
+        ],
+      );
+    }
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -616,51 +640,48 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
           style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
         ),
         const SizedBox(height: 5),
-        Skeletonizer(
+        DropdownButtonHideUnderline(
-          enabled: controller.model.isLoading,
+          child: DropdownButtonFormField<String>(
-          child: DropdownButtonHideUnderline(
+            initialValue: controller.model.selectedProduct?.uid,
-            child: DropdownButtonFormField<String>(
+            isExpanded: true,
-              initialValue: controller.model.selectedProduct?.uid,
+            icon: const Icon(Icons.arrow_drop_down),
-              isExpanded: true,
+            decoration: InputDecoration(
-              icon: const Icon(Icons.arrow_drop_down),
+              hintText: 'Select Product',
-              decoration: InputDecoration(
+              enabledBorder: OutlineInputBorder(
-                hintText: 'Select Product',
+                borderRadius: BorderRadius.circular(12),
-                enabledBorder: OutlineInputBorder(
+                borderSide: BorderSide(
-                  borderRadius: BorderRadius.circular(12),
+                  color: Theme.of(
-                  borderSide: BorderSide(
+                    context,
-                    color: Theme.of(
+                  ).colorScheme.primary.withValues(alpha: 0.2),
-                      context,
+                ),
-                    ).colorScheme.primary.withValues(alpha: 0.2),
+              ),
+            ),
+            items: [
+              DropdownMenuItem(child: Text("Select Product")),
+              ...controller.model.products.map(
+                (e) => DropdownMenuItem<String>(
+                  value: e.uid,
+                  child: Text(
+                    '${e.displayName} - '
+                    '${transactionController.model.formData.debitCurrency}${e.defaultAmount}',
                   ),
                 ),
               ),
-              items: [
+            ],
-                DropdownMenuItem(child: Text("Select Product")),
+            onChanged: (String? newValue) {
-                ...controller.model.products.map(
+              if (newValue != null) {
-                  (e) => DropdownMenuItem<String>(
+                BillProduct product = controller.model.products.firstWhere(
-                    value: e.uid,
+                  (e) => e.uid == newValue,
-                    child: Text(
+                );
-                      '${e.displayName} - '
+                controller.updateSelectedProduct(product);
-                      '${transactionController.model.formData.debitCurrency}${e.defaultAmount}',
+              }
-                    ),
+            },
-                  ),
+            validator: (value) {
-                ),
+              if (value == null || value.isEmpty) {
-              ],
+                return 'Please select a product';
-              onChanged: (String? newValue) {
+              }
-                if (newValue != null) {
+              return null;
-                  BillProduct product = controller.model.products.firstWhere(
+            },
-                    (e) => e.uid == newValue,
-                  );
-                  controller.updateSelectedProduct(product);
-                }
-              },
-              validator: (value) {
-                if (value == null || value.isEmpty) {
-                  return 'Please select a product';
-                }
-                return null;
-              },
-            ),
           ),
         ),
       ],