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 0be32fb..ee83d6a 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
@@ -20,13 +20,13 @@
 
 public class ChatActivity extends AppCompatActivity {
 
-  private ChatViewModel chatroomViewModel;
+  private ChatViewModel chatViewModel;
 
   //メンバー変数
   private EditText senderMessage;
   private EditText receiverMessage;
   private Button sendButton;
-  private Button backButton;
+  private ImageButton backButton;
 
   Tampopo tampopo;
 
@@ -40,12 +40,12 @@
     EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示
     setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定
 
-    chatroomViewModel = new ViewModelProvider(this).get(ChatViewModel.class);
+    chatViewModel = new ViewModelProvider(this).get(ChatViewModel.class);
 
     senderMessage = findViewById(R.id.sender_message);
     receiverMessage = findViewById(R.id.receiver_message);
     sendButton = findViewById(R.id.send_Button);
-    ImageButton backButton = findViewById(R.id.back_Button);
+    backButton = findViewById(R.id.back_Button);
 
     receiverMessage.setKeyListener(null);//受信メッセージ編集不可
 
@@ -69,11 +69,11 @@
 
 
 
-    String myId = tampopo.getUserId();
-    String friendId = tampopo.getChatFriendId();
+    //String myId = tampopo.getUserId();
+    //String friendId = tampopo.getChatFriendId();
     String chatroomId = tampopo.getChatroomId();
     //String chatroomId = "0";
-    String token = tampopo.getToken();
+    //String token = tampopo.getToken();
 
     // chatroomViewModel.enterChatroom(myId, friendId, token);
 
@@ -102,15 +102,15 @@
             String token = tampopo.getToken();
             String chatroomId = tampopo.getChatroomId();
             //String chatroomId = "0";
-            chatroomViewModel.sendMessage(chatroomId, senderId, senderText, token);
-            senderMessage.setText(senderText);//自分のメッセージを送信欄に表示
+            chatViewModel.sendMessage(chatroomId, senderId, senderText, token);
+            senderMessage.setText("");//自分のメッセージを送信欄に表示
           }
       }
     });
 
 
     //メッセージ受信
-    chatroomViewModel.getLatestMessageLiveData().observe(this, chatMessage -> {
+    chatViewModel.getLatestMessageLiveData().observe(this, chatMessage -> {
       if (chatMessage != null) {
         String myUserId = tampopo.getUserId(); // 自分のIDを取得
         String senderId = chatMessage.getSenderId(); //相手(メッセージ送信者)のIDを取得