diff --git a/.nvmrc b/.nvmrc index 5804aaa4f..5d9c217de 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v24.0.0 \ No newline at end of file +v22.19.0 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..8616e0ba6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +services: + rocketchat: + image: registry.rocket.chat/rocketchat/rocket.chat:latest + restart: always + environment: + - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0 + - MONGO_OPLOG_URL=mongodb://mongo:27017/local?replicaSet=rs0 + - ROOT_URL=http://localhost:3000 + - PORT=3000 + - OVERWRITE_SETTING_Show_Setup_Wizard=completed + ports: + - "3000:3000" + depends_on: + - mongo + - mongo-init-replica + + mongo: + image: mongo:8.0 + restart: always + volumes: + - mongodb_data:/data/db + command: mongod --oplogSize 128 --replSet rs0 + + mongo-init-replica: + image: mongo:8.0 + restart: "no" + command: > + bash -c "for i in {1..30}; do mongosh --host mongo:27017 --eval 'rs.initiate({_id: \"rs0\", members: [{_id: 0, host: \"mongo:27017\"}]})' && break || sleep 2; done" + depends_on: + - mongo + +volumes: + mongodb_data: diff --git a/packages/react/src/views/ChatInput/ChatInputFormattingToolbar.js b/packages/react/src/views/ChatInput/ChatInputFormattingToolbar.js index 25c96c6f2..0f80e598c 100644 --- a/packages/react/src/views/ChatInput/ChatInputFormattingToolbar.js +++ b/packages/react/src/views/ChatInput/ChatInputFormattingToolbar.js @@ -325,9 +325,8 @@ const ChatInputFormattingToolbar = ({ if (itemInFormatter) { return ( @@ -370,7 +369,6 @@ const ChatInputFormattingToolbar = ({ { - setEmojiOpen(false); handleEmojiClick(emoji); }} onClose={() => setEmojiOpen(false)}