diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
index c88c250..9dbdb9c 100644
--- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
@@ -13,11 +13,11 @@
 import androidx.lifecycle.ViewModelProvider;
 import com.example.tampopo_client.R;
 import com.example.tampopo_client.Tampopo;
-import com.example.tampopo_client.viewmodels.ChatroomViewModel;
+import com.example.tampopo_client.viewmodels.ChatViewModel;
 
 public class ChatActivity extends AppCompatActivity {
 
-  private ChatroomViewModel chatroomViewModel;
+  private ChatViewModel chatroomViewModel;
 
   //メンバー変数
   private EditText senderMessage;
@@ -34,7 +34,7 @@
     EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示
     setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定
 
-    chatroomViewModel = new ViewModelProvider(this).get(ChatroomViewModel.class);
+    chatroomViewModel = new ViewModelProvider(this).get(ChatViewModel.class);
 
     senderMessage = findViewById(R.id.sender_message);
     receiverMessage = findViewById(R.id.receiver_message);
@@ -69,7 +69,7 @@
               String senderId = tampopo.getUserId();
               String token = tampopo.getToken();
               String chatroomId = tampopo.getChatroomId();
-              chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
+              chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token, false);
               senderMessage.setText(senderText);//送信欄に表示
             }
         }
diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
index 20e07a1..2a23e34 100644
--- a/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
+++ b/app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
@@ -108,7 +108,7 @@
         // 受信した友達申請を管理する ViewModel を取得
         FriendReceivedRequestViewModel friendReceivedRequestViewModel = new ViewModelProvider(this).get(FriendReceivedRequestViewModel.class);
         // サーバーから受信した友達リクエスト一覧をロード
-        friendReceivedRequestViewModel.loadReceivedRequests(tampopo.getToken());
+        friendReceivedRequestViewModel.loadReceivedRequests(tampopo.getToken(),tampopo.getUserId());
         // LiveData を監視して、データが変わったら RecyclerView に反映
         friendReceivedRequestViewModel.getReceivedRequestsLiveData().observe(getViewLifecycleOwner(), new Observer<List<FriendRequest>>() {