From 4f26617e5017a62731e1d15ead5493f278b284dd Mon Sep 17 00:00:00 2001
From: Caroline Lucas Calheirani
 <97122568+CarolineLCa@users.noreply.github.com>
Date: Thu, 28 Dec 2023 15:42:35 -0300
Subject: [PATCH 1/7] fix:disabling going back function on connectionless proof
 flow (#1051)

Signed-off-by: Caroline Lucas Calheirani <ccalheirani@gmail.com>
---
 packages/legacy/core/App/navigators/RootStack.tsx | 2 +-
 packages/legacy/core/App/screens/Connection.tsx   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/legacy/core/App/navigators/RootStack.tsx b/packages/legacy/core/App/navigators/RootStack.tsx
index 1dc61a8590..a5779e2a5f 100644
--- a/packages/legacy/core/App/navigators/RootStack.tsx
+++ b/packages/legacy/core/App/navigators/RootStack.tsx
@@ -273,7 +273,7 @@ const RootStack: React.FC = () => {
         />
         <Stack.Screen name={Stacks.ContactStack} component={ContactStack} />
         <Stack.Screen name={Stacks.NotificationStack} component={NotificationStack} />
-        <Stack.Screen name={Stacks.ConnectionStack} component={DeliveryStack} />
+        <Stack.Screen name={Stacks.ConnectionStack} component={DeliveryStack} options={{ gestureEnabled: false }} />
         <Stack.Screen name={Stacks.ProofRequestsStack} component={ProofRequestStack} />
       </Stack.Navigator>
     )
diff --git a/packages/legacy/core/App/screens/Connection.tsx b/packages/legacy/core/App/screens/Connection.tsx
index 6351958f4a..75a69eced6 100644
--- a/packages/legacy/core/App/screens/Connection.tsx
+++ b/packages/legacy/core/App/screens/Connection.tsx
@@ -3,7 +3,7 @@ import { CommonActions, useFocusEffect } from '@react-navigation/native'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { AccessibilityInfo, Modal, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { AccessibilityInfo, BackHandler, Modal, ScrollView, StyleSheet, Text, View } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
 import Button, { ButtonType } from '../components/buttons/Button'
@@ -119,6 +119,11 @@ const Connection: React.FC<ConnectionProps> = ({ navigation, route }) => {
     navigation.getParent()?.navigate(TabStacks.HomeStack, { screen: Screens.Home })
   }
 
+  useEffect(() => {
+    const backHandler = BackHandler.addEventListener('hardwareBackPress', () => true)
+    return () => backHandler.remove()
+  }, [])
+
   useEffect(() => {
     if (state.shouldShowDelayMessage && !state.notificationRecord) {
       if (autoRedirectConnectionToHome) {

From 79c1e535257f8800c7e81d5fde7d461116310082 Mon Sep 17 00:00:00 2001
From: Bryce McMath <32586431+bryce-mcmath@users.noreply.github.com>
Date: Wed, 3 Jan 2024 07:02:08 -0800
Subject: [PATCH 2/7] fix: in app guides orientation on ipad (#1055)

Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
---
 .../App/components/tour/AttachTourStep.tsx    |  6 ++--
 .../core/App/components/tour/TourBox.tsx      |  7 ++--
 .../core/App/components/tour/TourOverlay.tsx  | 35 +++++++++++++------
 .../__snapshots__/TourBox.test.tsx.snap       |  2 +-
 .../__snapshots__/TourOverlay.test.tsx.snap   | 34 +++++++++---------
 5 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/packages/legacy/core/App/components/tour/AttachTourStep.tsx b/packages/legacy/core/App/components/tour/AttachTourStep.tsx
index 52e3d395f5..a80d21061d 100644
--- a/packages/legacy/core/App/components/tour/AttachTourStep.tsx
+++ b/packages/legacy/core/App/components/tour/AttachTourStep.tsx
@@ -1,5 +1,5 @@
 import React, { cloneElement, ReactElement, ReactNode, RefObject, useContext, useEffect, useRef } from 'react'
-import { StyleProp, View } from 'react-native'
+import { StyleProp, useWindowDimensions, View } from 'react-native'
 
 import { TourContext } from '../../contexts/tour/tour-context'
 import { TourID } from '../../types/tour'
@@ -46,7 +46,7 @@ export interface AttachTourStepProps<T> {
  */
 export function AttachTourStep<T>({ children, fill = false, index, tourID }: AttachTourStepProps<T>): ReactElement {
   const { currentStep, currentTour, changeSpot } = useContext(TourContext)
-
+  const { width: windowWidth, height: windowHeight } = useWindowDimensions()
   const childRef = useRef<View>(null)
 
   useEffect(() => {
@@ -55,7 +55,7 @@ export function AttachTourStep<T>({ children, fill = false, index, tourID }: Att
         changeSpot({ height, width, x, y })
       })
     }
-  }, [changeSpot, currentTour, currentStep, index])
+  }, [windowWidth, windowHeight, changeSpot, currentTour, currentStep, index])
 
   const { style, ...rest } = children.props
   const childStyle = style ?? {}
diff --git a/packages/legacy/core/App/components/tour/TourBox.tsx b/packages/legacy/core/App/components/tour/TourBox.tsx
index 6d567c93ca..adfe7c7429 100644
--- a/packages/legacy/core/App/components/tour/TourBox.tsx
+++ b/packages/legacy/core/App/components/tour/TourBox.tsx
@@ -1,9 +1,9 @@
 import React, { ReactElement, ReactNode, useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet, Text, TouchableOpacity, View, useWindowDimensions } from 'react-native'
+import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import Icon from 'react-native-vector-icons/MaterialIcons'
 
-import { tourMargin, hitSlop } from '../../constants'
+import { hitSlop } from '../../constants'
 import { useTheme } from '../../contexts/theme'
 import { RenderProps } from '../../contexts/tour/tour-context'
 import { testIdWithKey } from '../../utils/testable'
@@ -74,7 +74,6 @@ export function TourBox(props: TourBoxProps): ReactElement {
     stepsOutOf,
   } = props
   const { TextTheme, ColorPallet, OnboardingTheme } = useTheme()
-  const { width } = useWindowDimensions()
   const iconSize = 30
   const dismissIconName = 'clear'
   const iconColor = ColorPallet.notification.infoIcon
@@ -89,7 +88,7 @@ export function TourBox(props: TourBoxProps): ReactElement {
       borderRadius: 5,
       borderWidth: 1,
       padding: 20,
-      width: width - tourMargin * 2,
+      flex: 1,
       margin: 'auto',
     },
     headerContainer: {
diff --git a/packages/legacy/core/App/components/tour/TourOverlay.tsx b/packages/legacy/core/App/components/tour/TourOverlay.tsx
index 77981532e9..22f8dfa066 100644
--- a/packages/legacy/core/App/components/tour/TourOverlay.tsx
+++ b/packages/legacy/core/App/components/tour/TourOverlay.tsx
@@ -24,7 +24,7 @@ interface TourOverlayProps {
 export const TourOverlay = (props: TourOverlayProps) => {
   const { width: windowWidth, height: windowHeight } = useWindowDimensions()
   const { color, currentTour, currentStep, onBackdropPress, backdropOpacity, changeSpot, spot, tourStep } = props
-
+  const [viewBox, setViewBox] = useState(`0 0 ${windowWidth} ${windowHeight}`)
   const { next, previous, start, stop } = useContext(TourContext)
 
   const [tooltipStyle, setTooltipStyle] = useState<ViewStyle>({})
@@ -52,11 +52,12 @@ export const TourOverlay = (props: TourOverlayProps) => {
     const gapBetweenSpotAndTooltip = 50
     // if origin spot (ie. no spotlight)
     if (spot.x === 0 && spot.y === 0) {
-      const top = windowHeight / 5
+      // a relative margin so that the tooltip doesn't start at the very top of the screen
+      const oneSixthOfScreenHeight = windowHeight / 6
       setTooltipStyle({
         left: tourMargin,
         right: tourMargin,
-        top,
+        top: oneSixthOfScreenHeight,
       })
       // if spot is in the lower half of the screen
     } else if (spot.y >= windowHeight / 2) {
@@ -75,7 +76,13 @@ export const TourOverlay = (props: TourOverlayProps) => {
         top,
       })
     }
-  }, [spot.height, spot.width, spot.x, spot.y])
+  }, [windowWidth, windowHeight, spot.width, spot.height, spot.x, spot.y])
+
+  useEffect(() => {
+    // + 1 pixel to account for an svg size rounding issue that would cause
+    // a tiny gap around the overlay
+    setViewBox(`0 0 ${windowWidth + 1} ${windowHeight + 1}`)
+  }, [windowWidth, windowHeight])
 
   return (
     <Modal
@@ -84,24 +91,30 @@ export const TourOverlay = (props: TourOverlayProps) => {
       transparent={true}
       visible={currentStep !== undefined}
     >
-      <View style={{ height: windowHeight, width: windowWidth }} testID={testIdWithKey('SpotlightOverlay')}>
+      <View style={{ height: windowHeight + 1, width: windowWidth + 1 }} testID={testIdWithKey('SpotlightOverlay')}>
         <Svg
           testID={testIdWithKey('SpotOverlay')}
-          height="100%"
-          width="100%"
-          viewBox={`0 0 ${windowWidth} ${windowHeight}`}
+          height={windowHeight + 1}
+          width={windowWidth + 1}
+          viewBox={viewBox}
           onPress={handleBackdropPress}
           shouldRasterizeIOS={true}
           renderToHardwareTextureAndroid={true}
         >
           <Defs>
-            <Mask id="mask" x={0} y={0} height="100%" width="100%">
-              <Rect height="100%" width="100%" fill="#fff" />
+            <Mask id="mask" x={0} y={0} height={windowHeight + 1} width={windowWidth + 1}>
+              <Rect height={windowHeight + 1} width={windowWidth + 1} fill="#fff" />
               <SpotCutout />
             </Mask>
           </Defs>
 
-          <Rect height="100%" width="100%" fill={color} mask="url(#mask)" opacity={backdropOpacity} />
+          <Rect
+            height={windowHeight + 1}
+            width={windowWidth + 1}
+            fill={color}
+            mask="url(#mask)"
+            opacity={backdropOpacity}
+          />
         </Svg>
 
         <View
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/TourBox.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/TourBox.test.tsx.snap
index 2504f01c80..bed00ffef7 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/TourBox.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/TourBox.test.tsx.snap
@@ -11,9 +11,9 @@ Array [
         "borderColor": "#0099FF",
         "borderRadius": 5,
         "borderWidth": 1,
+        "flex": 1,
         "margin": "auto",
         "padding": 20,
-        "width": 700,
       }
     }
   >
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
index 6309515cca..10acb8e6d7 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/TourOverlay.test.tsx.snap
@@ -12,18 +12,18 @@ Array [
     <View
       style={
         Object {
-          "height": 1334,
-          "width": 750,
+          "height": 1335,
+          "width": 751,
         }
       }
       testID="com.ariesbifold:id/SpotlightOverlay"
     >
       <RNSVGSvgView
         align="xMidYMid"
-        bbHeight="100%"
-        bbWidth="100%"
+        bbHeight={1335}
+        bbWidth={751}
         focusable={false}
-        height="100%"
+        height={1335}
         meetOrSlice={0}
         minX={0}
         minY={0}
@@ -45,20 +45,20 @@ Array [
             },
             Object {
               "flex": 0,
-              "height": "100%",
-              "width": "100%",
+              "height": 1335,
+              "width": 751,
             },
           ]
         }
         testID="com.ariesbifold:id/SpotOverlay"
-        vbHeight={1334}
-        vbWidth={750}
-        width="100%"
+        vbHeight={1335}
+        vbWidth={751}
+        width={751}
       >
         <RNSVGGroup>
           <RNSVGDefs>
             <RNSVGMask
-              height="100%"
+              height={1335}
               maskContentUnits={1}
               maskTransform={
                 Array [
@@ -72,19 +72,19 @@ Array [
               }
               maskUnits={0}
               name="mask"
-              width="100%"
+              width={751}
               x={0}
               y={0}
             >
               <RNSVGRect
                 fill={4294967295}
-                height="100%"
+                height={1335}
                 propList={
                   Array [
                     "fill",
                   ]
                 }
-                width="100%"
+                width={751}
                 x={0}
                 y={0}
               />
@@ -92,7 +92,7 @@ Array [
           </RNSVGDefs>
           <RNSVGRect
             fill={4286611584}
-            height="100%"
+            height={1335}
             mask="mask"
             opacity={0.7}
             propList={
@@ -100,7 +100,7 @@ Array [
                 "fill",
               ]
             }
-            width="100%"
+            width={751}
             x={0}
             y={0}
           />
@@ -113,7 +113,7 @@ Array [
             "opacity": 1,
             "position": "absolute",
             "right": 25,
-            "top": 266.8,
+            "top": 222.33333333333334,
           }
         }
         testID="com.ariesbifold:id/SpotTooltip"

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 3/7] 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 f9fa5ed476..cfc8259ed0 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 4f64f9b421..214596c9fe 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>

From 115d3aafb360c12c719e07b07c061fd9f4cfb4f1 Mon Sep 17 00:00:00 2001
From: "Jason C. Leach" <jason.leach@fullboar.ca>
Date: Thu, 4 Jan 2024 12:35:45 -0800
Subject: [PATCH 4/7] fix: update README.md (#1058)

Signed-off-by: Jason C. Leach <jason.leach@fullboar.ca>
---
 packages/react-native-attestation/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-native-attestation/README.md b/packages/react-native-attestation/README.md
index 719c9ded31..efebabc509 100644
--- a/packages/react-native-attestation/README.md
+++ b/packages/react-native-attestation/README.md
@@ -5,7 +5,7 @@ Mobile app attestation
 ## Installation
 
 ```sh
-npm install react-native-attestation
+yarn add @hyperledger/react-native-attestation
 ```
 
 ## Usage

From ff9df04206b1b7c9a8292731807043dda8e9e9b6 Mon Sep 17 00:00:00 2001
From: Bryce McMath <32586431+bryce-mcmath@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:20:02 -0800
Subject: [PATCH 5/7] fix: prevent clipping of buttons on cr modal (#1059)

Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
---
 .../components/modals/CommonRemoveModal.tsx   |   57 +-
 .../CommonRemoveModal.test.tsx.snap           | 1449 ++++++++---------
 .../CredentialOffer.test.tsx.snap             |  207 ++-
 3 files changed, 802 insertions(+), 911 deletions(-)

diff --git a/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx b/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
index 385efcf3f6..90def7981a 100644
--- a/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
+++ b/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Modal, Platform, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
+import { Modal, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import Collapsible from 'react-native-collapsible'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Icon from 'react-native-vector-icons/MaterialIcons'
@@ -99,30 +99,32 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, o
   }
 
   const styles = StyleSheet.create({
+    safeAreaView: {
+      backgroundColor: ColorPallet.brand.modalPrimaryBackground,
+      borderTopRightRadius: 10,
+      borderTopLeftRadius: 10,
+    },
     container: {
       height: '100%',
-      backgroundColor: ColorPallet.brand.modalPrimaryBackground,
-      padding: 20,
+      paddingTop: 10,
+      paddingHorizontal: 20,
     },
     controlsContainer: {
       marginTop: 'auto',
       marginHorizontal: 20,
-      marginBottom: Platform.OS === 'ios' ? 108 : 80,
+      marginBottom: 10,
       position: 'relative',
     },
     overlay: {
       flex: 1,
       backgroundColor: 'rgba(0,0,0,0.5)',
+      paddingTop: 65,
     },
     headerView: {
       alignItems: 'flex-end',
-      marginTop: 65,
-      backgroundColor: ColorPallet.brand.modalPrimaryBackground,
       height: 55,
       paddingTop: 10,
       paddingRight: 20,
-      borderTopRightRadius: 10,
-      borderTopLeftRadius: 10,
     },
     bodyText: {
       ...TextTheme.modalNormal,
@@ -291,34 +293,27 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, o
   return (
     <Modal transparent={true} visible={visible} animationType="slide">
       <View style={styles.overlay}>
-        <View style={[styles.headerView]}>
-          <TouchableOpacity
-            accessibilityLabel={t('Global.Close')}
-            accessibilityRole={'button'}
-            testID={testIdWithKey('Close')}
-            onPress={() => onCancel && onCancel()}
-            hitSlop={hitSlop}
-          >
-            <Icon name={'close'} size={42} color={ColorPallet.brand.modalIcon} />
-          </TouchableOpacity>
-        </View>
-        <SafeAreaView
-          edges={['left', 'right', 'bottom']}
-          style={[
-            {
-              backgroundColor: ColorPallet.brand.modalPrimaryBackground,
-            },
-          ]}
-        >
-          <ScrollView style={[styles.container]}>
+        <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.safeAreaView}>
+          <View style={styles.headerView}>
+            <TouchableOpacity
+              accessibilityLabel={t('Global.Close')}
+              accessibilityRole={'button'}
+              testID={testIdWithKey('Close')}
+              onPress={() => onCancel && onCancel()}
+              hitSlop={hitSlop}
+            >
+              <Icon name={'close'} size={42} color={ColorPallet.brand.modalIcon} />
+            </TouchableOpacity>
+          </View>
+          <ScrollView style={styles.container}>
             <>
               {headerImageForType()}
               {contentForType()}
             </>
           </ScrollView>
-          <View style={[styles.controlsContainer]}>
+          <View style={styles.controlsContainer}>
             <ContentGradient backgroundColor={ColorPallet.brand.modalPrimaryBackground} height={30} />
-            <View style={[{ paddingTop: 10 }]}>
+            <View style={{ paddingTop: 10 }}>
               <Button
                 title={titleForConfirmButton()}
                 accessibilityLabel={labelForConfirmButton()}
@@ -329,7 +324,7 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, o
                 }
               />
             </View>
-            <View style={[{ paddingTop: 10 }]}>
+            <View style={{ paddingTop: 10 }}>
               <Button
                 title={t('Global.Cancel')}
                 accessibilityLabel={t('Global.Cancel')}
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/CommonRemoveModal.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/CommonRemoveModal.test.tsx.snap
index 468603285e..ab654d06a6 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/CommonRemoveModal.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/CommonRemoveModal.test.tsx.snap
@@ -12,118 +12,111 @@ exports[`CommonRemoveModal Component Credential offer decline renders correctly
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -198,14 +191,12 @@ exports[`CommonRemoveModal Component Credential offer decline renders correctly
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -287,11 +278,9 @@ exports[`CommonRemoveModal Component Credential offer decline renders correctly
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -365,11 +354,9 @@ exports[`CommonRemoveModal Component Credential offer decline renders correctly
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -460,118 +447,111 @@ exports[`CommonRemoveModal Component Custom notification decline renders correct
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -651,14 +631,12 @@ exports[`CommonRemoveModal Component Custom notification decline renders correct
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -740,11 +718,9 @@ exports[`CommonRemoveModal Component Custom notification decline renders correct
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -818,11 +794,9 @@ exports[`CommonRemoveModal Component Custom notification decline renders correct
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -913,118 +887,111 @@ exports[`CommonRemoveModal Component Proof request decline renders correctly 1`]
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -1113,14 +1080,12 @@ exports[`CommonRemoveModal Component Proof request decline renders correctly 1`]
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -1202,11 +1167,9 @@ exports[`CommonRemoveModal Component Proof request decline renders correctly 1`]
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -1280,11 +1243,9 @@ exports[`CommonRemoveModal Component Proof request decline renders correctly 1`]
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -1375,118 +1336,111 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 1`] = `
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -1790,14 +1744,12 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 1`] = `
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -1879,11 +1831,9 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 1`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -1957,11 +1907,9 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 1`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -2052,118 +2000,111 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 2`] = `
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -2227,14 +2168,12 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 2`] = `
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -2316,11 +2255,9 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 2`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -2394,11 +2331,9 @@ exports[`CommonRemoveModal Component Remove contact renders correctly 2`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -2489,118 +2424,111 @@ exports[`CommonRemoveModal Component Remove credential renders correctly 1`] = `
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -3037,14 +2965,12 @@ exports[`CommonRemoveModal Component Remove credential renders correctly 1`] = `
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -3126,11 +3052,9 @@ exports[`CommonRemoveModal Component Remove credential renders correctly 1`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -3204,11 +3128,9 @@ exports[`CommonRemoveModal Component Remove credential renders correctly 1`] = `
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -3299,118 +3221,111 @@ exports[`CommonRemoveModal Component Rerenders correctly when not visible 1`] =
       Object {
         "backgroundColor": "rgba(0,0,0,0.5)",
         "flex": 1,
+        "paddingTop": 65,
       }
     }
   >
-    <View
-      style={
+    <RNCSafeAreaView
+      edges={
         Array [
-          Object {
-            "alignItems": "flex-end",
-            "backgroundColor": "#000000",
-            "borderTopLeftRadius": 10,
-            "borderTopRightRadius": 10,
-            "height": 55,
-            "marginTop": 65,
-            "paddingRight": 20,
-            "paddingTop": 10,
-          },
+          "left",
+          "right",
+          "bottom",
         ]
       }
+      style={
+        Object {
+          "backgroundColor": "#000000",
+          "borderTopLeftRadius": 10,
+          "borderTopRightRadius": 10,
+        }
+      }
     >
       <View
-        accessibilityLabel="Global.Close"
-        accessibilityRole="button"
-        accessibilityState={
+        style={
           Object {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
+            "alignItems": "flex-end",
+            "height": 55,
+            "paddingRight": 20,
+            "paddingTop": 10,
           }
         }
-        accessibilityValue={
-          Object {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
+      >
+        <View
+          accessibilityLabel="Global.Close"
+          accessibilityRole="button"
+          accessibilityState={
+            Object {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
           }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        hitSlop={
-          Object {
-            "bottom": 44,
-            "left": 44,
-            "right": 44,
-            "top": 44,
+          accessibilityValue={
+            Object {
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
+            }
           }
-        }
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "opacity": 1,
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          hitSlop={
+            Object {
+              "bottom": 44,
+              "left": 44,
+              "right": 44,
+              "top": 44,
+            }
           }
-        }
-        testID="com.ariesbifold:id/Close"
-      >
-        <Text
-          allowFontScaling={false}
-          selectable={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            Array [
-              Object {
-                "color": "#FFFFFF",
-                "fontSize": 42,
-              },
-              undefined,
-              Object {
-                "fontFamily": "Material Icons",
-                "fontStyle": "normal",
-                "fontWeight": "normal",
-              },
-              Object {},
-            ]
+            Object {
+              "opacity": 1,
+            }
           }
+          testID="com.ariesbifold:id/Close"
         >
-          
-        </Text>
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              Array [
+                Object {
+                  "color": "#FFFFFF",
+                  "fontSize": 42,
+                },
+                undefined,
+                Object {
+                  "fontFamily": "Material Icons",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                Object {},
+              ]
+            }
+          >
+            
+          </Text>
+        </View>
       </View>
-    </View>
-    <RNCSafeAreaView
-      edges={
-        Array [
-          "left",
-          "right",
-          "bottom",
-        ]
-      }
-      style={
-        Array [
-          Object {
-            "backgroundColor": "#000000",
-          },
-        ]
-      }
-    >
       <RCTScrollView
         style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-              "height": "100%",
-              "padding": 20,
-            },
-          ]
+          Object {
+            "height": "100%",
+            "paddingHorizontal": 20,
+            "paddingTop": 10,
+          }
         }
       >
         <View>
@@ -3714,14 +3629,12 @@ exports[`CommonRemoveModal Component Rerenders correctly when not visible 1`] =
       </RCTScrollView>
       <View
         style={
-          Array [
-            Object {
-              "marginBottom": 108,
-              "marginHorizontal": 20,
-              "marginTop": "auto",
-              "position": "relative",
-            },
-          ]
+          Object {
+            "marginBottom": 10,
+            "marginHorizontal": 20,
+            "marginTop": "auto",
+            "position": "relative",
+          }
         }
       >
         <View
@@ -3803,11 +3716,9 @@ exports[`CommonRemoveModal Component Rerenders correctly when not visible 1`] =
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
@@ -3881,11 +3792,9 @@ exports[`CommonRemoveModal Component Rerenders correctly when not visible 1`] =
         </View>
         <View
           style={
-            Array [
-              Object {
-                "paddingTop": 10,
-              },
-            ]
+            Object {
+              "paddingTop": 10,
+            }
           }
         >
           <View
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
index 652e8c6e0c..56ce5608ca 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
@@ -2644,118 +2644,111 @@ exports[`displays a credential offer screen declining a credential 1`] = `
         Object {
           "backgroundColor": "rgba(0,0,0,0.5)",
           "flex": 1,
+          "paddingTop": 65,
         }
       }
     >
-      <View
-        style={
+      <RNCSafeAreaView
+        edges={
           Array [
-            Object {
-              "alignItems": "flex-end",
-              "backgroundColor": "#000000",
-              "borderTopLeftRadius": 10,
-              "borderTopRightRadius": 10,
-              "height": 55,
-              "marginTop": 65,
-              "paddingRight": 20,
-              "paddingTop": 10,
-            },
+            "left",
+            "right",
+            "bottom",
           ]
         }
+        style={
+          Object {
+            "backgroundColor": "#000000",
+            "borderTopLeftRadius": 10,
+            "borderTopRightRadius": 10,
+          }
+        }
       >
         <View
-          accessibilityLabel="Global.Close"
-          accessibilityRole="button"
-          accessibilityState={
+          style={
             Object {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
+              "alignItems": "flex-end",
+              "height": 55,
+              "paddingRight": 20,
+              "paddingTop": 10,
             }
           }
-          accessibilityValue={
-            Object {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
+        >
+          <View
+            accessibilityLabel="Global.Close"
+            accessibilityRole="button"
+            accessibilityState={
+              Object {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
             }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          hitSlop={
-            Object {
-              "bottom": 44,
-              "left": 44,
-              "right": 44,
-              "top": 44,
+            accessibilityValue={
+              Object {
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
+              }
             }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
-          style={
-            Object {
-              "opacity": 1,
+            accessible={true}
+            collapsable={false}
+            focusable={true}
+            hitSlop={
+              Object {
+                "bottom": 44,
+                "left": 44,
+                "right": 44,
+                "top": 44,
+              }
             }
-          }
-          testID="com.ariesbifold:id/Close"
-        >
-          <Text
-            allowFontScaling={false}
-            selectable={false}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
             style={
-              Array [
-                Object {
-                  "color": "#FFFFFF",
-                  "fontSize": 42,
-                },
-                undefined,
-                Object {
-                  "fontFamily": "Material Icons",
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
-                },
-                Object {},
-              ]
+              Object {
+                "opacity": 1,
+              }
             }
+            testID="com.ariesbifold:id/Close"
           >
-            
-          </Text>
+            <Text
+              allowFontScaling={false}
+              selectable={false}
+              style={
+                Array [
+                  Object {
+                    "color": "#FFFFFF",
+                    "fontSize": 42,
+                  },
+                  undefined,
+                  Object {
+                    "fontFamily": "Material Icons",
+                    "fontStyle": "normal",
+                    "fontWeight": "normal",
+                  },
+                  Object {},
+                ]
+              }
+            >
+              
+            </Text>
+          </View>
         </View>
-      </View>
-      <RNCSafeAreaView
-        edges={
-          Array [
-            "left",
-            "right",
-            "bottom",
-          ]
-        }
-        style={
-          Array [
-            Object {
-              "backgroundColor": "#000000",
-            },
-          ]
-        }
-      >
         <RCTScrollView
           style={
-            Array [
-              Object {
-                "backgroundColor": "#000000",
-                "height": "100%",
-                "padding": 20,
-              },
-            ]
+            Object {
+              "height": "100%",
+              "paddingHorizontal": 20,
+              "paddingTop": 10,
+            }
           }
         >
           <View>
@@ -2830,14 +2823,12 @@ exports[`displays a credential offer screen declining a credential 1`] = `
         </RCTScrollView>
         <View
           style={
-            Array [
-              Object {
-                "marginBottom": 108,
-                "marginHorizontal": 20,
-                "marginTop": "auto",
-                "position": "relative",
-              },
-            ]
+            Object {
+              "marginBottom": 10,
+              "marginHorizontal": 20,
+              "marginTop": "auto",
+              "position": "relative",
+            }
           }
         >
           <View
@@ -2919,11 +2910,9 @@ exports[`displays a credential offer screen declining a credential 1`] = `
           </View>
           <View
             style={
-              Array [
-                Object {
-                  "paddingTop": 10,
-                },
-              ]
+              Object {
+                "paddingTop": 10,
+              }
             }
           >
             <View
@@ -2997,11 +2986,9 @@ exports[`displays a credential offer screen declining a credential 1`] = `
           </View>
           <View
             style={
-              Array [
-                Object {
-                  "paddingTop": 10,
-                },
-              ]
+              Object {
+                "paddingTop": 10,
+              }
             }
           >
             <View

From 7b81dccaf2a5ad0674726b6f8442b0de1f8d081d Mon Sep 17 00:00:00 2001
From: Wade King <wkingnumber2@gmail.com>
Date: Fri, 5 Jan 2024 12:38:32 -0800
Subject: [PATCH 6/7] feat: disable sharing proof if it is in a bad state
 (#1052)

Signed-off-by: wadeking98 <wkingnumber2@gmail.com>
---
 packages/legacy/core/App/screens/ProofRequest.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index ff12e6994c..cde3de5af4 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -5,7 +5,7 @@ import {
   AnonCredsRequestedAttributeMatch,
   AnonCredsRequestedPredicateMatch,
 } from '@aries-framework/anoncreds'
-import { CredentialExchangeRecord } from '@aries-framework/core'
+import { CredentialExchangeRecord, ProofState } from '@aries-framework/core'
 import { useConnectionById, useProofById } from '@aries-framework/react-hooks'
 import { Attribute, Predicate } from '@hyperledger/aries-oca/build/legacy'
 import { useIsFocused } from '@react-navigation/core'
@@ -500,7 +500,12 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
             testID={testIdWithKey('Share')}
             buttonType={ButtonType.Primary}
             onPress={handleAcceptPress}
-            disabled={!hasAvailableCredentials || !hasSatisfiedPredicates(getCredentialsFields()) || revocationOffense}
+            disabled={
+              !hasAvailableCredentials ||
+              !hasSatisfiedPredicates(getCredentialsFields()) ||
+              revocationOffense ||
+              proof?.state !== ProofState.RequestReceived
+            }
           />
         </View>
         <View style={styles.footerButton}>

From a208a4593ec4921afd5d63ac46f4b6c675b117c4 Mon Sep 17 00:00:00 2001
From: Bryce McMath <32586431+bryce-mcmath@users.noreply.github.com>
Date: Fri, 5 Jan 2024 12:50:11 -0800
Subject: [PATCH 7/7] fix: add bottom margin to button container (#1060)

Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
---
 packages/legacy/core/App/screens/ProofRequesting.tsx           | 1 +
 .../screens/__snapshots__/ProofRequesting.test.tsx.snap        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/packages/legacy/core/App/screens/ProofRequesting.tsx b/packages/legacy/core/App/screens/ProofRequesting.tsx
index cfc8259ed0..2d5fc768af 100644
--- a/packages/legacy/core/App/screens/ProofRequesting.tsx
+++ b/packages/legacy/core/App/screens/ProofRequesting.tsx
@@ -117,6 +117,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
     buttonContainer: {
       marginTop: 'auto',
       marginHorizontal: 20,
+      marginBottom: 10,
     },
   })
 
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 214596c9fe..74acd61f4c 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ProofRequesting.test.tsx.snap
@@ -114,6 +114,7 @@ exports[`ProofRequesting Component generate new qr works correctly 1`] = `
   <View
     style={
       Object {
+        "marginBottom": 10,
         "marginHorizontal": 20,
         "marginTop": "auto",
       }
@@ -310,6 +311,7 @@ exports[`ProofRequesting Component renders correctly 1`] = `
   <View
     style={
       Object {
+        "marginBottom": 10,
         "marginHorizontal": 20,
         "marginTop": "auto",
       }
@@ -462,6 +464,7 @@ exports[`ProofRequesting Component renders correctly 2`] = `
   <View
     style={
       Object {
+        "marginBottom": 10,
         "marginHorizontal": 20,
         "marginTop": "auto",
       }