From d88483937158034001ecb86ad206473812713ae4 Mon Sep 17 00:00:00 2001
From: Johannes Carlsen <hannes.mcman@gmail.com>
Date: Mon, 13 Aug 2018 18:11:57 -0500
Subject: [PATCH 1/2] wrap filter popover component in viewport

---
 .../views/components/filter/filter-popover.js | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/source/views/components/filter/filter-popover.js b/source/views/components/filter/filter-popover.js
index 71194336e8..6b01eb62e0 100644
--- a/source/views/components/filter/filter-popover.js
+++ b/source/views/components/filter/filter-popover.js
@@ -4,6 +4,7 @@ import Popover from 'react-native-popover-view'
 import {FilterSection} from './section'
 import type {FilterType} from './types'
 import {type TouchableUnion} from '../touchable'
+import {Viewport} from '../viewport'
 import * as c from '../colors'
 
 type Props = {
@@ -37,16 +38,20 @@ export class FilterPopover extends React.PureComponent<Props, State> {
 		const {anchor, onClosePopover, visible} = this.props
 
 		return (
-			<Popover
-				arrowStyle={arrowStyle}
-				fromView={anchor}
-				isVisible={visible}
-				onClose={() => onClosePopover(filter)}
-				placement="bottom"
-				popoverStyle={popoverContainer}
-			>
-				<FilterSection filter={filter} onChange={this.onFilterChanged} />
-			</Popover>
+			<Viewport
+				render={viewport => (
+					<Popover
+						arrowStyle={arrowStyle}
+						fromView={anchor}
+						isVisible={visible}
+						onClose={() => onClosePopover(filter)}
+						placement="bottom"
+						popoverStyle={popoverContainer}
+					>
+						<FilterSection filter={filter} onChange={this.onFilterChanged} />
+					</Popover>
+				)}
+			/>
 		)
 	}
 }

From 590ffd07f8c658c56c1e7443ae08ecce3ff6a689 Mon Sep 17 00:00:00 2001
From: Johannes Carlsen <hannes.mcman@gmail.com>
Date: Mon, 13 Aug 2018 18:20:04 -0500
Subject: [PATCH 2/2] remove unused variable

---
 source/views/components/filter/filter-popover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/views/components/filter/filter-popover.js b/source/views/components/filter/filter-popover.js
index 6b01eb62e0..6ff3347b22 100644
--- a/source/views/components/filter/filter-popover.js
+++ b/source/views/components/filter/filter-popover.js
@@ -39,7 +39,7 @@ export class FilterPopover extends React.PureComponent<Props, State> {
 
 		return (
 			<Viewport
-				render={viewport => (
+				render={() => (
 					<Popover
 						arrowStyle={arrowStyle}
 						fromView={anchor}