Merge pull request #1527 from korhaliv/fix/channels-hscroll

fix: hscroll for current and suggested channels panels
LN-Zap · Feb 7, 2019 · f030552 · f030552
2 parents 431f41d + 2169677
commit f030552
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/components/Contacts/AddChannel/AddChannel.js b/app/components/Contacts/AddChannel/AddChannel.js
@@ -124,7 +124,7 @@ const AddChannel = ({
 
       <Bar my={3} borderColor="gray" css={{ opacity: 0.3 }} />
 
-      <Panel.Body css={{ 'overflow-y': 'overlay' }}>
+      <Panel.Body css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}>
         {filteredNetworkNodes.length > 0 &&
           filteredNetworkNodes.map(node => {
             const canConnectToNode = canConnect(node)

diff --git a/app/components/Contacts/Network/Network.js b/app/components/Contacts/Network/Network.js
@@ -177,7 +177,7 @@ class Network extends Component {
           )}
         </Panel.Header>
 
-        <Panel.Body css={{ 'overflow-y': 'overlay' }}>
+        <Panel.Body css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}>
           {!hasChannels && <SuggestedNodes py={3} mx={3} />}
 
           {hasChannels && (

diff --git a/app/components/UI/Modal.js b/app/components/UI/Modal.js
@@ -70,7 +70,12 @@ class Modal extends React.Component {
             </Flex>
           )}
         </Panel.Header>
-        <Panel.Body px={4} pb={4} {...rest} css={{ 'overflow-y': 'overlay' }}>
+        <Panel.Body
+          px={4}
+          pb={4}
+          {...rest}
+          css={{ 'overflow-y': 'overlay', 'overflow-x': 'hidden' }}
+        >
           {' '}
           {children}
         </Panel.Body>

diff --git a/test/unit/components/UI/__snapshots__/Modal.spec.js.snap b/test/unit/components/UI/__snapshots__/Modal.spec.js.snap
@@ -25,6 +25,7 @@ exports[`component.UI.Modal should render correctly 1`] = `
   -ms-flex: 1;
   flex: 1;
   overflow-y: overlay;
+  overflow-x: hidden;
 }
 
 .c0 {