Merge pull request #2486 from keep-network/title-for-modal-window-fix

Fix bug with modal window's title not displaying This PR fixes the bug which prevented modal window's title from being displayed after changes from #2444
keep-network · Jun 1, 2021 · 87c1385 · 87c1385
2 parents 778d7fe + 5c6711d
commit 87c1385
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/solidity/dashboard/src/components/Modal.jsx b/solidity/dashboard/src/components/Modal.jsx
@@ -43,18 +43,17 @@ const Modal = React.memo(
                   : ""
               }`}
             >
-              {!isFullScreen ||
-                (!hideTitleBar && (
-                  <div className="modal-title">
-                    <h4 className="text-darker-grey">{props.title}</h4>
-                    <div className="modal-close" onClick={closeModal}>
-                      <Icons.Cross
-                        width={crossIconWidth}
-                        height={crossIconHeight}
-                      />
-                    </div>
+              {!isFullScreen && !hideTitleBar && (
+                <div className="modal-title">
+                  <h4 className="text-darker-grey">{props.title}</h4>
+                  <div className="modal-close" onClick={closeModal}>
+                    <Icons.Cross
+                      width={crossIconWidth}
+                      height={crossIconHeight}
+                    />
                   </div>
-                ))}
+                </div>
+              )}
               <div className="modal-content">{props.children}</div>
             </div>
           </div>,