Merge with master

2 files changed, 7 insertions, 9 deletions

diff --git a/src/components/common/BottomDrawer.tsx b/src/components/common/BottomDrawer.tsx
index 16e98690..b79b8820 100644
--- a/src/components/common/BottomDrawer.tsx
+++ b/src/components/common/BottomDrawer.tsx
@@ -23,7 +23,7 @@ const BottomDrawer: React.FC<BottomDrawerProps> = (props) => {
   const {isOpen, setIsOpen, showHeader, initialSnapPosition} = props;
   const drawerRef = useRef<BottomSheet>(null);
   const [modalVisible, setModalVisible] = useState(isOpen);
-  const bgAlpha = useValue(isOpen ? 1 : 0);
+  const bgAlpha = useValue(isOpen ? 0 : 1);
 
   useEffect(() => {
     if (isOpen) {
diff --git a/src/components/common/GenericMoreInfoDrawer.tsx b/src/components/common/GenericMoreInfoDrawer.tsx
index 0928ed44..cfc45131 100644
--- a/src/components/common/GenericMoreInfoDrawer.tsx
+++ b/src/components/common/GenericMoreInfoDrawer.tsx
@@ -3,15 +3,16 @@ import {
   GestureResponderEvent,
   StyleSheet,
   Text,
+  TextStyle,
   TouchableOpacity,
   View,
   ViewProps,
   ViewStyle,
 } from 'react-native';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
-import BottomDrawer from './BottomDrawer';
 import {TAGG_LIGHT_BLUE} from '../../constants';
 import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
+import BottomDrawer from './BottomDrawer';
 
 // conforms the JSX onPress attribute type
 type OnPressHandler = (event: GestureResponderEvent) => void;
@@ -20,13 +21,12 @@ interface GenericMoreInfoDrawerProps extends ViewProps {
   isOpen: boolean;
   setIsOpen: (visible: boolean) => void;
   showIcons: boolean;
-  textColor: string;
   // An array of title, onPressHandler, and icon component
-  buttons: [string, OnPressHandler, JSX.Element?][];
+  buttons: [string, OnPressHandler, JSX.Element?, TextStyle?][];
 }
 
 const GenericMoreInfoDrawer: React.FC<GenericMoreInfoDrawerProps> = (props) => {
-  const {buttons, showIcons, textColor} = props;
+  const {buttons, showIcons} = props;
   // each button is 80px high, cancel button is always there
   const initialSnapPosition =
     (buttons.length + 1) * 80 + useSafeAreaInsets().bottom;
@@ -44,13 +44,11 @@ const GenericMoreInfoDrawer: React.FC<GenericMoreInfoDrawerProps> = (props) => {
       showHeader={false}
       initialSnapPosition={initialSnapPosition}>
       <View style={styles.panel}>
-        {buttons.map(([title, action, icon], index) => (
+        {buttons.map(([title, action, icon, textStyle], index) => (
           <View key={index}>
             <TouchableOpacity style={panelButtonStyle} onPress={action}>
               {showIcons && <View style={styles.icon}>{icon}</View>}
-              <Text style={[styles.panelButtonTitle, {color: textColor}]}>
-                {title}
-              </Text>
+              <Text style={[styles.panelButtonTitle, textStyle]}>{title}</Text>
             </TouchableOpacity>
             <View style={styles.divider} />
           </View>