Merge branch 'fix-scroll-flicker'

4 files changed, 6 insertions, 1 deletions

diff --git a/app/components/AdvancedSettingsStyles.js b/app/components/AdvancedSettingsStyles.js
index 95ec71fb41..0e4d840769 100644
--- a/app/components/AdvancedSettingsStyles.js
+++ b/app/components/AdvancedSettingsStyles.js
@@ -44,6 +44,7 @@ export default {
       flexGrow: 1,
       flexShrink: 0,
       flexBasis: 'auto',
+      overflow: 'visible',
     },
     advanced_settings__cell: {
       backgroundColor: '#44AD4D',
diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js
index d706e7fcc2..5864ed55a3 100644
--- a/app/components/SelectLocation.js
+++ b/app/components/SelectLocation.js
@@ -76,7 +76,7 @@ export default class SelectLocation extends React.Component<SelectLocationProps,
               </View>
 
               <CustomScrollbars autoHide={true} ref={(ref) => (this._scrollView = ref)}>
-                <View>
+                <View style={styles.content}>
                   <Text style={styles.subtitle}>
                     While connected, your real location is masked with a private and secure location
                     in the selected region
diff --git a/app/components/SelectLocationStyles.js b/app/components/SelectLocationStyles.js
index a0aec306d4..c1fca00d07 100644
--- a/app/components/SelectLocationStyles.js
+++ b/app/components/SelectLocationStyles.js
@@ -27,6 +27,9 @@ export default {
       flex: 0,
       opacity: 0.6,
     },
+    content: {
+      overflow: 'visible',
+    },
     relay_status: {
       width: 16,
       height: 16,
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js
index 82616f7e4a..6063a5a567 100644
--- a/app/components/SettingsStyles.js
+++ b/app/components/SettingsStyles.js
@@ -24,6 +24,7 @@ export default Object.assign(
       flexDirection: 'column',
       flex: 1,
       justifyContent: 'space-between',
+      overflow: 'visible',
     },
     settings__scrollview: {
       flexGrow: 1,