Merge branch 'master' onto working copy

2 files changed, 6 insertions, 12 deletions

diff --git a/frontend/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js b/frontend/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js
index 4cc87798..eea62f84 100644
--- a/frontend/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js
+++ b/frontend/src/components/app/sidebars/topology/building/BuildingSidebarComponent.js
@@ -1,12 +1,11 @@
 import React from 'react'
-import NewRoomConstructionContainer
-    from '../../../../../containers/app/sidebars/topology/building/NewRoomConstructionContainer'
+import NewRoomConstructionContainer from '../../../../../containers/app/sidebars/topology/building/NewRoomConstructionContainer'
 
 const BuildingSidebarComponent = () => {
     return (
         <div>
             <h2>Building</h2>
-            <NewRoomConstructionContainer/>
+            <NewRoomConstructionContainer />
         </div>
     )
 }
diff --git a/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js b/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
index 75b00c54..fd552c1e 100644
--- a/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
+++ b/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
@@ -1,15 +1,10 @@
 import React from 'react'
 
-const NewRoomConstructionComponent = ({
-                                          onStart,
-                                          onFinish,
-                                          onCancel,
-                                          currentRoomInConstruction,
-                                      }) => {
+const NewRoomConstructionComponent = ({ onStart, onFinish, onCancel, currentRoomInConstruction }) => {
     if (currentRoomInConstruction === '-1') {
         return (
             <div className="btn btn-outline-primary btn-block" onClick={onStart}>
-                <span className="fa fa-plus mr-2"/>
+                <span className="fa fa-plus mr-2" />
                 Construct a new room
             </div>
         )
@@ -17,11 +12,11 @@ const NewRoomConstructionComponent = ({
     return (
         <div>
             <div className="btn btn-primary btn-block" onClick={onFinish}>
-                <span className="fa fa-check mr-2"/>
+                <span className="fa fa-check mr-2" />
                 Finalize new room
             </div>
             <div className="btn btn-default btn-block" onClick={onCancel}>
-                <span className="fa fa-times mr-2"/>
+                <span className="fa fa-times mr-2" />
                 Cancel construction
             </div>
         </div>