From 70ce40728fcc7b0c5357944660d2319279fba92d Mon Sep 17 00:00:00 2001
From: barun1997 <barunn.pandey@gmail.com>
Date: Thu, 15 Apr 2021 17:20:54 +0545
Subject: [PATCH 1/4] Fix regression bug

---
 src/components/IOUConfirmationList.js | 3 ++-
 src/components/OptionsList.js         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index d9507ced11e4..8bcf8837736b 100644
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -198,9 +198,10 @@ class IOUConfirmationList extends Component {
 
     render() {
         return (
-            <View style={[styles.flex1, styles.w100]}>
+            <View style={[styles.flex1, styles.w100, styles.justifyContentBetween]}>
                 <View style={[styles.flex1]}>
                     <OptionsList
+                        listContainerStyles={[styles.flexGrow0]}
                         sections={this.getSections()}
                         disableArrowKeysActions
                         hideAdditionalOptionStates
diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
index d6f81138c538..8e8e21da89b6 100644
--- a/src/components/OptionsList.js
+++ b/src/components/OptionsList.js
@@ -11,6 +11,9 @@ const propTypes = {
     // option Background Color
     optionBackgroundColor: PropTypes.string,
 
+    // option flexStyle for the options list container
+    listContainerStyles: PropTypes.arrayOf(PropTypes.object),
+
     // Style for hovered state
     // eslint-disable-next-line react/forbid-prop-types
     optionHoveredStyle: PropTypes.object,
@@ -77,6 +80,7 @@ const defaultProps = {
     optionBackgroundColor: undefined,
     optionHoveredStyle: undefined,
     contentContainerStyles: [],
+    listContainerStyles: [],
     sections: [],
     focusedIndex: 0,
     selectedOptions: [],
@@ -196,7 +200,7 @@ class OptionsList extends Component {
 
     render() {
         return (
-            <View style={[styles.flexGrow0]}>
+            <View style={[...(this.props.listContainerStyles ? this.props.listContainerStyles : [styles.flex1])]}>
                 {this.props.headerMessage ? (
                     <View style={[styles.ph5, styles.pb5]}>
                         <Text style={[styles.textLabel, styles.colorMuted]}>

From a5664659237a76796f7727d5c9f8e8eb531b7faa Mon Sep 17 00:00:00 2001
From: Barun Pandey <barunn.pandey@gmail.com>
Date: Fri, 16 Apr 2021 00:00:42 +0545
Subject: [PATCH 2/4] Update OptionsList.js

Change the default value for listContainerStyles
---
 src/components/OptionsList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
index 8e8e21da89b6..794f4eef0641 100644
--- a/src/components/OptionsList.js
+++ b/src/components/OptionsList.js
@@ -80,7 +80,7 @@ const defaultProps = {
     optionBackgroundColor: undefined,
     optionHoveredStyle: undefined,
     contentContainerStyles: [],
-    listContainerStyles: [],
+    listContainerStyles: undefined,
     sections: [],
     focusedIndex: 0,
     selectedOptions: [],

From 0cec32a399d9aa5f4f5fe408667140a3c89fdcbd Mon Sep 17 00:00:00 2001
From: barun1997 <barunn.pandey@gmail.com>
Date: Fri, 16 Apr 2021 17:43:42 +0545
Subject: [PATCH 3/4] Make code simpler

---
 src/components/OptionsList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
index 794f4eef0641..2b4efa57ac21 100644
--- a/src/components/OptionsList.js
+++ b/src/components/OptionsList.js
@@ -80,7 +80,7 @@ const defaultProps = {
     optionBackgroundColor: undefined,
     optionHoveredStyle: undefined,
     contentContainerStyles: [],
-    listContainerStyles: undefined,
+    listContainerStyles: [styles.flex1],
     sections: [],
     focusedIndex: 0,
     selectedOptions: [],
@@ -200,7 +200,7 @@ class OptionsList extends Component {
 
     render() {
         return (
-            <View style={[...(this.props.listContainerStyles ? this.props.listContainerStyles : [styles.flex1])]}>
+            <View style={[this.props.listContainerStyles]}>
                 {this.props.headerMessage ? (
                     <View style={[styles.ph5, styles.pb5]}>
                         <Text style={[styles.textLabel, styles.colorMuted]}>

From 473e2ac830b6a1433b348ec38d087027a917d1fc Mon Sep 17 00:00:00 2001
From: barun1997 <barunn.pandey@gmail.com>
Date: Fri, 16 Apr 2021 21:38:49 +0545
Subject: [PATCH 4/4] Fix 2D array

---
 src/components/OptionsList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
index 2b4efa57ac21..f554f83d6da5 100644
--- a/src/components/OptionsList.js
+++ b/src/components/OptionsList.js
@@ -200,7 +200,7 @@ class OptionsList extends Component {
 
     render() {
         return (
-            <View style={[this.props.listContainerStyles]}>
+            <View style={this.props.listContainerStyles}>
                 {this.props.headerMessage ? (
                     <View style={[styles.ph5, styles.pb5]}>
                         <Text style={[styles.textLabel, styles.colorMuted]}>