From ed26d794f991dc2d3fcf4ada11dc052678c57af3 Mon Sep 17 00:00:00 2001
From: Itay <4023066+itayplav@users.noreply.github.com>
Date: Fri, 9 Jun 2023 08:33:02 -0500
Subject: [PATCH 1/2] Add target-ability to 'Next' button

---
 .../scenes/CreateWalletSelectCryptoScene.tsx  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/scenes/CreateWalletSelectCryptoScene.tsx b/src/components/scenes/CreateWalletSelectCryptoScene.tsx
index 9935fc425af..0028d90714d 100644
--- a/src/components/scenes/CreateWalletSelectCryptoScene.tsx
+++ b/src/components/scenes/CreateWalletSelectCryptoScene.tsx
@@ -202,19 +202,20 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
 
   const renderCreateWalletRow: ListRenderItem<WalletCreateItem> = useHandler(item => {
     const { key, displayName, pluginId, tokenId } = item.item
-
+    const value = selectedItems[key]
     const accessibilityHint = sprintf(lstrings.create_wallet_hint, displayName)
+    const accessibilityState = { checked: value, selected: value }
     const toggle = (
       <Switch
+        accessibilityState={accessibilityState}
         accessibilityRole="switch"
-        accessibilityState={{ selected: selectedItems[key] }}
         accessibilityHint={accessibilityHint}
         ios_backgroundColor={theme.toggleButtonOff}
         trackColor={{
           false: theme.toggleButtonOff,
           true: theme.toggleButton
         }}
-        value={selectedItems[key]}
+        value={value}
         onValueChange={() => handleCreateWalletToggle(key)}
       />
     )
@@ -223,6 +224,7 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
       <CreateWalletSelectCryptoRow
         pluginId={pluginId}
         tokenId={tokenId}
+        key={displayName}
         walletName={displayName}
         onPress={() => handleCreateWalletToggle(key)}
         rightSide={toggle}
@@ -235,12 +237,10 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
   const renderNextButton = React.useMemo(
     () => (
       <Fade noFadeIn={defaultSelection.length > 0} visible={numSelected > 0} duration={300}>
-        <View style={styles.bottomButton}>
-          <MainButton label={lstrings.string_next_capitalized} type="primary" marginRem={[0, -0.5]} onPress={handleNext} alignSelf="center" />
-        </View>
+        <MainButton label={lstrings.string_next_capitalized} type="primary" marginRem={[0, -0.5]} onPress={handleNext} alignSelf="center" />
       </Fade>
     ),
-    [defaultSelection, handleNext, numSelected, styles.bottomButton]
+    [defaultSelection, handleNext, numSelected]
   )
 
   return (
@@ -273,7 +273,7 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
             keyExtractor={keyExtractor}
             renderItem={renderCreateWalletRow}
           />
-          {renderNextButton}
+          <View style={styles.bottomArea}>{renderNextButton}</View>
         </View>
       )}
     </SceneWrapper>
@@ -281,10 +281,10 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
 }
 
 const getStyles = cacheStyles((theme: Theme) => ({
-  bottomButton: {
-    alignSelf: 'center',
-    bottom: theme.rem(1),
-    position: 'absolute'
+  bottomArea: {
+    flex: 1,
+    justifyContent: 'flex-end',
+    paddingBottom: theme.rem(1)
   },
   content: {
     flex: 1

From ec098ade99f4911750eb6f1d2ae6ed6c86a7fa32 Mon Sep 17 00:00:00 2001
From: Itay <4023066+itayplav@users.noreply.github.com>
Date: Fri, 9 Jun 2023 09:00:01 -0500
Subject: [PATCH 2/2] fixup! Add target-ability to 'Next' button

Update jest test
---
 .../CreateWalletSelectCryptoScene.test.tsx.snap        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
index 075b855fc44..ea227393212 100644
--- a/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
+++ b/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
@@ -726,19 +726,19 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
         </RCTScrollView>
       </View>
       <View
-        pointerEvents="none"
         style={
           Object {
-            "opacity": 0,
+            "flex": 1,
+            "justifyContent": "flex-end",
+            "paddingBottom": 22,
           }
         }
       >
         <View
+          pointerEvents="none"
           style={
             Object {
-              "alignSelf": "center",
-              "bottom": 22,
-              "position": "absolute",
+              "opacity": 0,
             }
           }
         >