diff --git a/lib/screens/groups/screens/group_create_screen.dart b/lib/screens/groups/screens/group_create_screen.dart
index 211894b..bfe0904 100644
--- a/lib/screens/groups/screens/group_create_screen.dart
+++ b/lib/screens/groups/screens/group_create_screen.dart
@@ -49,7 +49,10 @@ class _GroupCreateScreenState extends State<GroupCreateScreen> {
       if (parts.length >= 2) {
         final name = parts[0].trim();
         final account = parts[1].trim();
-        final phone = parts[2].trim();
+        String phone = '';
+        if (parts.length > 2) {
+          phone = parts.sublist(2).join(',').trim();
+        }
         if (name.isNotEmpty && account.isNotEmpty) {
           members.add(
             Recipient(
@@ -96,10 +99,7 @@ class _GroupCreateScreenState extends State<GroupCreateScreen> {
       AppSnackBar.showSuccess(context, 'Group created successfully.');
       context.pop(true); // Return true to indicate a new group was created
     } else {
-      AppSnackBar.showError(
-        context,
-        result.error ?? 'Failed to create group.',
-      );
+      AppSnackBar.showError(context, result.error ?? 'Failed to create group.');
     }
   }
 
diff --git a/lib/screens/pay/pay_screen.dart b/lib/screens/pay/pay_screen.dart
index 08e9ed7..6fe9f95 100644
--- a/lib/screens/pay/pay_screen.dart
+++ b/lib/screens/pay/pay_screen.dart
@@ -678,7 +678,7 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
             onChanged: (String? newValue) {
               if (newValue != null) {
                 BillProduct product = controller.model.products.firstWhere(
-                  (e) => e.uid == newValue,
+                  (e) => e.name == newValue,
                 );
                 controller.updateSelectedProduct(product);
               }