fix: fix logic adding payment card and update decide user join reques…

…t api
lemonadesocial · Oct 11, 2024 · 77ba3e7 · 77ba3e7
1 parent 8be2ce1
commit 77ba3e7
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 599 deletions.
diff --git a/lib/core/data/event/repository/event_repository_impl.dart b/lib/core/data/event/repository/event_repository_impl.dart
@@ -414,7 +414,7 @@ class EventRepositoryImpl implements EventRepository {
     if (result.hasException) {
       return Left(Failure.withGqlException(result.exception));
     }
-    return Right(result.parsedData?.decideUserJoinRequests ?? false);
+    return Right(result.parsedData?.decideUserJoinRequests.isNotEmpty == true);
   }
 
   @override
@@ -431,7 +431,7 @@ class EventRepositoryImpl implements EventRepository {
     if (result.hasException) {
       return Left(Failure.withGqlException(result.exception));
     }
-    return Right(result.parsedData?.decideUserJoinRequests ?? false);
+    return Right(result.parsedData?.decideUserJoinRequests.isNotEmpty == true);
   }
 
   @override

diff --git a/...s_page/sub_pages/event_tickets_payment_method_page/event_tickets_payment_method_page.dart b/...s_page/sub_pages/event_tickets_payment_method_page/event_tickets_payment_method_page.dart
@@ -94,6 +94,7 @@ class EventTicketsPaymentMethodPage extends StatelessWidget {
                                       if (newCard != null) {
                                         onCardAdded?.call(newCard);
                                       }
+                                      AutoRouter.of(context).pop();
                                     },
                                   );
                                 }
@@ -113,7 +114,14 @@ class EventTicketsPaymentMethodPage extends StatelessWidget {
                             ),
                           ),
                           if (selectedCard != null)
-                            buyButton ?? const SizedBox.shrink(),
+                            buyButton != null
+                                ? Padding(
+                                    padding: EdgeInsets.symmetric(
+                                      horizontal: Spacing.smMedium,
+                                    ),
+                                    child: buyButton!,
+                                  )
+                                : const SizedBox.shrink(),
                         ],
                       ),
                     );

diff --git a/...age/sub_pages/event_tickets_summary_page/widgets/payment_footer/pay_by_stripe_footer.dart b/...age/sub_pages/event_tickets_summary_page/widgets/payment_footer/pay_by_stripe_footer.dart
@@ -79,6 +79,13 @@ class PayByStripeFooter extends StatelessWidget {
                         publishableKey: stripePublishableKey,
                         onCardAdded: onCardAdded,
                         onSelectCard: onSelectCard,
+                        buyButton: PayButton(
+                          disabled: disabled,
+                          pricingInfo: pricingInfo,
+                          selectedCurrency: selectedCurrency,
+                          selectedNetwork: selectedNetwork,
+                          isFree: isFree,
+                        ),
                       ),
                     );
                   },
@@ -100,6 +107,7 @@ class PayByStripeFooter extends StatelessWidget {
                               pricingInfo: pricingInfo,
                               selectedCurrency: selectedCurrency,
                               selectedNetwork: selectedNetwork,
+                              isFree: isFree,
                             ),
                           ),
                         );

diff --git a/.../notification/widgets/notification_item_by_type/event_join_request_notification_item.dart b/.../notification/widgets/notification_item_by_type/event_join_request_notification_item.dart
@@ -50,7 +50,8 @@ class EventJoinRequestNotificationItem extends StatelessWidget {
             );
       },
     );
-    if (response.result?.parsedData?.decideUserJoinRequests == true) {
+    if (response.result?.parsedData?.decideUserJoinRequests.isNotEmpty ==
+        true) {
       onRemove?.call();
     }
   }

diff --git a/lib/graphql/backend/event/mutation/decide_user_join_request.graphql b/lib/graphql/backend/event/mutation/decide_user_join_request.graphql
@@ -1,3 +1,6 @@
 mutation DecideUserJoinRequests($input: DecideUserJoinRequestsInput!) {
-  decideUserJoinRequests(input: $input)
+  decideUserJoinRequests(input: $input) {
+    _id
+    processed
+  }
 }