Commit 8d05e556 by Kim Peace

Merge branch 'bug/#43939_create_same_users_dm_room' into 'develop'

Fixed to hide loading indicator when create room already exist and doesnt move to decided

See merge request !231
parents e6f0908c 9163ccee
...@@ -391,10 +391,10 @@ ReverseDelegate.leaveRoom = function () { ...@@ -391,10 +391,10 @@ ReverseDelegate.leaveRoom = function () {
CHAT_SOCKET.emitLeaveRoom(); CHAT_SOCKET.emitLeaveRoom();
}; };
// for android call
ReverseDelegate.displayExistRoom = function (roomID) { ReverseDelegate.displayExistRoom = function (roomID) {
if (confirm("error_already_exist_same_user")) { if (confirm("error_already_exist_same_user")) {
NativeBridgeDelegate.joinRoom(roomID); NativeBridgeDelegate.joinRoom(roomID);
} }
NativeBridgeDelegate.hideLoadingIndicator();
return; return;
}; };
...@@ -105,11 +105,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () { ...@@ -105,11 +105,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () {
} else { } else {
//loadingIndicatorを表示 //loadingIndicatorを表示
Common.showLoadingIndicator(); Common.showLoadingIndicator();
let userIdList = new Array(); let userIdList = selectedUserList.map((user) => user.shopMemberId);
selectedUserList.forEach(function (user) {
userIdList.push(user.shopMemberId);
});
// TODO: check why here using trimmedroomname instead of encodedRoomName // TODO: check why here using trimmedroomname instead of encodedRoomName
// ルーム名のtrimmingした後、URIencodingを行う // ルーム名のtrimmingした後、URIencodingを行う
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment