fixed bugs

duo_backend/api/friend_routes.go

@@ -56,11 +56,12 @@ func (server *Server) SendFriendRequest(context context.Context, req *pb.FriendR
 	}
 
 	_, dbErr := server.Store.AddFriendRequest(context, db.AddFriendRequestParams{
-		RequesterID: payload.UserID,
-		RequesteeID: targetUuid,
+		RequesterID:   payload.UserID,
+		RequesterName: payload.Username,
+		RequesteeID:   targetUuid,
 	})
 
-	if dbErr != nil {
+	if dbErr != nil && dbErr != sql.ErrNoRows {
 		log.Printf("error adding friend request: %v", dbErr)
 		return nil, status.Errorf(codes.Internal, "error adding friend request to db")
 	}

duo_client/lib/provider/api_provider.dart

@@ -113,6 +113,7 @@ class ApiProvider extends ChangeNotifier implements AbstractServerConnection {
           }
         case StackStateEvent:
           {
+            debugPrint('Received Stack State Event');
             final stackStateEvent = event as StackStateEvent;
             _stackState = stackStateEvent.state;
             notifyListeners();
@@ -342,7 +343,6 @@ class ApiProvider extends ChangeNotifier implements AbstractServerConnection {
       "Event stream should not be accessed from apiProvider");
 
   @override
-  // TODO: implement eventController
   StreamController<ServerEvent> get eventController => throw UnimplementedError(
       "Event controller should not be accessed from apiProvider");
 }

duo_client/lib/screens/lobby_screen.dart

@@ -48,19 +48,20 @@ class _LobbyScreenState extends ConsumerState<LobbyScreen>
       setState(() {
         joiningGame = true;
         debugPrint('Game Id: ${_apiProvider.gameId}');
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          Navigator.of(context).pushReplacementNamed(GameScreen.route);
-        });
+      });
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        Navigator.of(context).pushReplacementNamed(GameScreen.route);
       });
     }
     if (_apiProvider.gameId == -2 && !_apiProvider.hasLobbyStream) {
       setState(() {
         debugPrint('Lobby Stream: ${_apiProvider.lobbyStatus?.lobbyId}');
         //Case if lobby is deleted by the Host
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          debugPrint('Lobby deletion detected; leaving... ');
-          Navigator.of(context).pushReplacementNamed(HomeScreen.route);
-        });
+
+        debugPrint('Lobby deletion detected; leaving... ');
+      });
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        Navigator.of(context).pushReplacementNamed(HomeScreen.route);
       });
     }
 

duo_client/lib/utils/connection/grpc_server_connection.dart

@@ -327,6 +327,7 @@ class GrpcServerConnection extends AbstractServerConnection {
               streamEstablishedCompleter.complete();
             }
             eventController.add(StackStateEvent(value));
+            debugPrint('card on top: ${value.placeStack.cardIdOnTop}');
             debugPrint('stack stream acknowledge received');
           }
         },
@@ -382,6 +383,7 @@ class GrpcServerConnection extends AbstractServerConnection {
 
       gameStream?.listen(
         (value) {
+          debugPrint('new game state: $value');
           eventController.add(GameStateEvent(value));
         },
         cancelOnError: true,

duo_client/lib/widgets/card_scroll_view.dart

@@ -86,7 +86,7 @@ class _CardScrollViewState extends ConsumerState<CardScrollView> {
         itemCount: cards.length,
         itemBuilder: (context, index) {
           return Dismissible(
-            key: Key(cards[index].cardName),
+            key: UniqueKey(),
             direction: isTurn ? DismissDirection.up : DismissDirection.none,
             onDismissed: (direction) {
               if (!_isReordering) {

duo_client/lib/widgets/game_stacks.dart

@@ -18,9 +18,7 @@ class _GameStacksState extends ConsumerState<GameStacks> {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       //init the stack stream
       String token = await ref.read(apiProvider).getToken();
-      await ref
-          .read(apiProvider)
-          .getStackStream(token, ref.read(apiProvider).gameId);
+      ref.read(apiProvider).getStackStream(token, ref.read(apiProvider).gameId);
     });
     super.initState();
   }
@@ -30,8 +28,12 @@ class _GameStacksState extends ConsumerState<GameStacks> {
     ApiProvider _apiProvider = ref.watch(apiProvider);
     StackState stackState = _apiProvider.stackState ??
         StackState(
-          drawStack: DrawStackState(cardIds: ['green_3']),
-          placeStack: PlaceStackState(cardIdOnTop: 'green_4'),
+          drawStack: DrawStackState(
+              cardIds:
+                  _apiProvider.stackState?.drawStack.cardIds ?? ['green_1']),
+          placeStack: PlaceStackState(
+              cardIdOnTop:
+                  _apiProvider.stackState?.placeStack.cardIdOnTop ?? 'green_1'),
         );
     return Padding(
       padding: const EdgeInsets.all(8.0),

duo_client/lib/widgets/invite_dialog.dart

@@ -83,7 +83,8 @@ class InviteDialog extends ConsumerWidget {
                         await Share.share(
                             'Join me on Duo using this code: *$invideCode*');
                       },
-                    )
+                    ),
+                    // const SizedBox(width: Constants.defaultPadding / 2),
                   ],
                 ),
               ),