Skip to content

Commit

Permalink
Merge pull request #347 from kookmin-sw/#306-I-accept-chatroom-v2
Browse files Browse the repository at this point in the history
#306 i accept chatroom v2
  • Loading branch information
chaeyeonKong authored May 23, 2024
2 parents 9d2d141 + a9e8dcf commit 79f7a1f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
7 changes: 0 additions & 7 deletions frontend/lib/screen/chat_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,6 @@ class _ChatScreenState extends State<ChatScreen> {

@override
Widget build(BuildContext context) {
final selectedIndexProvider = Provider.of<SelectedIndexModel>(context);

// selectedIndex 설정을 addPostFrameCallback 내에서 호출
SchedulerBinding.instance.addPostFrameCallback((_) {
selectedIndexProvider.selectedIndex = 2;
});

stompClient = Provider.of<StompClient>(context);

return Scaffold(
Expand Down
3 changes: 1 addition & 2 deletions frontend/lib/widgets/choose_purpose.dart
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ class _ChoosePurposeState extends State<ChoosePurpose> {
return;
}

Map<String, dynamic> response =
await matchRequest(senderId, receiverId, _selectedIndex!);
matchRequest(senderId, receiverId, _selectedIndex!);
Navigator.of(context).pop();
Navigator.of(context).pop();
selectedIndexProvider.selectedIndex = 1;
Expand Down
2 changes: 0 additions & 2 deletions frontend/lib/widgets/user_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,13 @@ class ReceivedReqDialog extends StatelessWidget {
context,
MaterialPageRoute(
builder: (context) => ChatScreen(
// chatroomId: response["data"]["chatroomId"],
matchId: matchId,
nickname: nickname,
logoUrl: logoUrl,
chatroomId: null,
),
),
);

// 오프라인으로 전환
autoOfflineService.autoOffline();
},
Expand Down

0 comments on commit 79f7a1f

Please sign in to comment.