From 13172460186914601ceb4fc6a373dec178d0c5c6 Mon Sep 17 00:00:00 2001
From: Bryce McMath <32586431+bryce-mcmath@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:25:10 -0800
Subject: [PATCH] fix: adjust safeareaview and remove unneeded styles (#1056)

Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
---
 .../core/App/screens/ProofRequesting.tsx      |  23 +-
 .../ProofRequesting.test.tsx.snap             | 353 ++++++++----------
 2 files changed, 175 insertions(+), 201 deletions(-)

diff --git a/packages/legacy/core/App/screens/ProofRequesting.tsx b/packages/legacy/core/App/screens/ProofRequesting.tsx
index f9fa5ed47..cfc8259ed 100644
--- a/packages/legacy/core/App/screens/ProofRequesting.tsx
+++ b/packages/legacy/core/App/screens/ProofRequesting.tsx
@@ -118,9 +118,6 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
       marginTop: 'auto',
       marginHorizontal: 20,
     },
-    footerButton: {
-      marginBottom: 10,
-    },
   })
 
   const createProofRequest = useCallback(async () => {
@@ -192,7 +189,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
   }, [proofRecord])
 
   return (
-    <SafeAreaView style={styles.container} edges={['left', 'right']}>
+    <SafeAreaView style={styles.container} edges={['left', 'right', 'bottom']}>
       <ScrollView>
         <View style={styles.qrContainer}>
           {generating && <LoadingIndicator />}
@@ -204,16 +201,14 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
         </View>
       </ScrollView>
       <View style={styles.buttonContainer}>
-        <View style={styles.footerButton}>
-          <Button
-            title={t('Verifier.RefreshQR')}
-            accessibilityLabel={t('Verifier.RefreshQR')}
-            testID={testIdWithKey('GenerateNewQR')}
-            buttonType={ButtonType.Primary}
-            onPress={() => createProofRequest()}
-            disabled={generating}
-          />
-        </View>
+        <Button
+          title={t('Verifier.RefreshQR')}
+          accessibilityLabel={t('Verifier.RefreshQR')}
+          testID={testIdWithKey('GenerateNewQR')}
+          buttonType={ButtonType.Primary}
+          onPress={() => createProofRequest()}
+          disabled={generating}
+        />
       </View>
     </SafeAreaView>
   )
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap
index 4f64f9b42..214596c9f 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`ProofRequesting Component generate new qr works correctly 1`] = `
     Array [
       "left",
       "right",
+      "bottom",
     ]
   }
   style={
@@ -119,84 +120,76 @@ exports[`ProofRequesting Component generate new qr works correctly 1`] = `
     }
   >
     <View
+      accessibilityLabel="Verifier.RefreshQR"
+      accessibilityRole="button"
+      accessibilityState={
+        Object {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": true,
+          "expanded": undefined,
+          "selected": undefined,
+        }
+      }
+      accessibilityValue={
+        Object {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
+      }
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
       style={
         Object {
-          "marginBottom": 10,
+          "backgroundColor": "rgba(53, 130, 63, 0.35)",
+          "borderRadius": 4,
+          "opacity": 1,
+          "padding": 16,
         }
       }
+      testID="com.ariesbifold:id/GenerateNewQR"
     >
       <View
-        accessibilityLabel="Verifier.RefreshQR"
-        accessibilityRole="button"
-        accessibilityState={
-          Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": true,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
-          }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
         style={
           Object {
-            "backgroundColor": "rgba(53, 130, 63, 0.35)",
-            "borderRadius": 4,
-            "opacity": 1,
-            "padding": 16,
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "center",
           }
         }
-        testID="com.ariesbifold:id/GenerateNewQR"
       >
-        <View
+        <Text
           style={
-            Object {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "justifyContent": "center",
-            }
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "bold",
+                "textAlign": "center",
+              },
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "bold",
+                "textAlign": "center",
+              },
+              false,
+              false,
+            ]
           }
         >
-          <Text
-            style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 18,
-                  "fontWeight": "bold",
-                  "textAlign": "center",
-                },
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 18,
-                  "fontWeight": "bold",
-                  "textAlign": "center",
-                },
-                false,
-                false,
-              ]
-            }
-          >
-            Verifier.RefreshQR
-          </Text>
-        </View>
+          Verifier.RefreshQR
+        </Text>
       </View>
     </View>
   </View>
@@ -209,6 +202,7 @@ exports[`ProofRequesting Component renders correctly 1`] = `
     Array [
       "left",
       "right",
+      "bottom",
     ]
   }
   style={
@@ -322,84 +316,76 @@ exports[`ProofRequesting Component renders correctly 1`] = `
     }
   >
     <View
+      accessibilityLabel="Verifier.RefreshQR"
+      accessibilityRole="button"
+      accessibilityState={
+        Object {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": true,
+          "expanded": undefined,
+          "selected": undefined,
+        }
+      }
+      accessibilityValue={
+        Object {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
+      }
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
       style={
         Object {
-          "marginBottom": 10,
+          "backgroundColor": "rgba(53, 130, 63, 0.35)",
+          "borderRadius": 4,
+          "opacity": 1,
+          "padding": 16,
         }
       }
+      testID="com.ariesbifold:id/GenerateNewQR"
     >
       <View
-        accessibilityLabel="Verifier.RefreshQR"
-        accessibilityRole="button"
-        accessibilityState={
-          Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": true,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
-          }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
         style={
           Object {
-            "backgroundColor": "rgba(53, 130, 63, 0.35)",
-            "borderRadius": 4,
-            "opacity": 1,
-            "padding": 16,
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "center",
           }
         }
-        testID="com.ariesbifold:id/GenerateNewQR"
       >
-        <View
+        <Text
           style={
-            Object {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "justifyContent": "center",
-            }
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "bold",
+                "textAlign": "center",
+              },
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "bold",
+                "textAlign": "center",
+              },
+              false,
+              false,
+            ]
           }
         >
-          <Text
-            style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 18,
-                  "fontWeight": "bold",
-                  "textAlign": "center",
-                },
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 18,
-                  "fontWeight": "bold",
-                  "textAlign": "center",
-                },
-                false,
-                false,
-              ]
-            }
-          >
-            Verifier.RefreshQR
-          </Text>
-        </View>
+          Verifier.RefreshQR
+        </Text>
       </View>
     </View>
   </View>
@@ -412,6 +398,7 @@ exports[`ProofRequesting Component renders correctly 2`] = `
     Array [
       "left",
       "right",
+      "bottom",
     ]
   }
   style={
@@ -481,79 +468,71 @@ exports[`ProofRequesting Component renders correctly 2`] = `
     }
   >
     <View
+      accessibilityLabel="Verifier.RefreshQR"
+      accessibilityRole="button"
+      accessibilityState={
+        Object {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": false,
+          "expanded": undefined,
+          "selected": undefined,
+        }
+      }
+      accessibilityValue={
+        Object {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
+      }
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
       style={
         Object {
-          "marginBottom": 10,
+          "backgroundColor": "#42803E",
+          "borderRadius": 4,
+          "opacity": 1,
+          "padding": 16,
         }
       }
+      testID="com.ariesbifold:id/GenerateNewQR"
     >
       <View
-        accessibilityLabel="Verifier.RefreshQR"
-        accessibilityRole="button"
-        accessibilityState={
-          Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": false,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
-          }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
         style={
           Object {
-            "backgroundColor": "#42803E",
-            "borderRadius": 4,
-            "opacity": 1,
-            "padding": 16,
+            "alignItems": "center",
+            "flexDirection": "row",
+            "justifyContent": "center",
           }
         }
-        testID="com.ariesbifold:id/GenerateNewQR"
       >
-        <View
+        <Text
           style={
-            Object {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "justifyContent": "center",
-            }
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "bold",
+                "textAlign": "center",
+              },
+              false,
+              false,
+              false,
+            ]
           }
         >
-          <Text
-            style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 18,
-                  "fontWeight": "bold",
-                  "textAlign": "center",
-                },
-                false,
-                false,
-                false,
-              ]
-            }
-          >
-            Verifier.RefreshQR
-          </Text>
-        </View>
+          Verifier.RefreshQR
+        </Text>
       </View>
     </View>
   </View>