4 files changed, 43 insertions, 3 deletions
diff --git a/src/containers/profile/DeleteProfileModal.js b/src/containers/modals/DeleteProfileModal.js
index b59db055..0108a1eb 100644
--- a/src/containers/profile/DeleteProfileModal.js
+++ b/src/containers/modals/DeleteProfileModal.js
@@ -1,6 +1,6 @@
 import React from "react";
 import {connect} from "react-redux";
-import {closeDeleteProfileModal} from "../../actions/profile";
+import {closeDeleteProfileModal} from "../../actions/modals/profile";
 import {deleteCurrentUser} from "../../actions/users";
 import ConfirmationModal from "../../components/modals/ConfirmationModal";
 
diff --git a/src/containers/modals/EditRoomNameModal.js b/src/containers/modals/EditRoomNameModal.js
new file mode 100644
index 00000000..649ffeda
--- /dev/null
+++ b/src/containers/modals/EditRoomNameModal.js
@@ -0,0 +1,38 @@
+import React from "react";
+import {connect} from "react-redux";
+import {closeEditRoomNameModal} from "../../actions/modals/topology";
+import {editRoomName} from "../../actions/topology";
+import TextInputModal from "../../components/modals/TextInputModal";
+
+const EditRoomNameModalComponent = ({visible, previousName, callback}) => (
+    <TextInputModal title="Edit room name"
+                    label="Room name"
+                    show={visible}
+                    initialValue={previousName}
+                    callback={callback}/>
+);
+
+const mapStateToProps = state => {
+    return {
+        visible: state.modals.editRoomNameModalVisible,
+        previousName: state.interactionLevel.mode === "ROOM" ? state.objects.room[state.interactionLevel.roomId].name : "",
+    };
+};
+
+const mapDispatchToProps = dispatch => {
+    return {
+        callback: (name) => {
+            if (name) {
+                dispatch(editRoomName(name));
+            }
+            dispatch(closeEditRoomNameModal());
+        }
+    };
+};
+
+const EditRoomNameModal = connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(EditRoomNameModalComponent);
+
+export default EditRoomNameModal;
diff --git a/src/containers/simulations/NewSimulationModal.js b/src/containers/modals/NewSimulationModal.js
index cb858fed..d85b59ef 100644
--- a/src/containers/simulations/NewSimulationModal.js
+++ b/src/containers/modals/NewSimulationModal.js
@@ -1,6 +1,7 @@
 import React from "react";
 import {connect} from "react-redux";
-import {addSimulation, closeNewSimulationModal} from "../../actions/simulations";
+import {closeNewSimulationModal} from "../../actions/modals/simulations";
+import {addSimulation} from "../../actions/simulations";
 import TextInputModal from "../../components/modals/TextInputModal";
 
 const NewSimulationModalComponent = ({visible, callback}) => (
diff --git a/src/containers/sidebars/topology/room/RoomNameContainer.js b/src/containers/sidebars/topology/room/RoomNameContainer.js
index 5408cb6c..7b9dc249 100644
--- a/src/containers/sidebars/topology/room/RoomNameContainer.js
+++ b/src/containers/sidebars/topology/room/RoomNameContainer.js
@@ -1,4 +1,5 @@
 import {connect} from "react-redux";
+import {openEditRoomNameModal} from "../../../../actions/modals/topology";
 import RoomNameComponent from "../../../../components/sidebars/topology/room/RoomNameComponent";
 
 const mapStateToProps = state => {
@@ -9,7 +10,7 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = dispatch => {
     return {
-        onEdit: () => dispatch(null), // FIXME
+        onEdit: () => dispatch(openEditRoomNameModal()),
     };
 };