Add additional back buttons to cancel to cancel transaction of BYO an…

…d borrow
anqi20 · Dec 22, 2021 · e591e2a · e591e2a
1 parent a292a54
commit e591e2a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/screens/borrow-screens/BorrowSelectionScreen.js b/screens/borrow-screens/BorrowSelectionScreen.js
@@ -142,6 +142,12 @@ export default function BorrowSelectionScreen({ navigation, route }) {
               setContainerNum={setContainerNum}
             />
             {renderNextButton()}
+            <TouchableOpacity
+              onPress={() => navigation.popToTop()}
+              style={[globalStyles.button, { width: "90%" }]}
+            >
+              <Text style={globalStyles.buttonText}>Cancel</Text>
+            </TouchableOpacity>
           </View>
           <FooterText />
         </View>

diff --git a/screens/byo-screens/BYOScreen.js b/screens/byo-screens/BYOScreen.js
@@ -95,8 +95,7 @@ export default function BYOScreen({ navigation }) {
         }}
       >
         <View style={styles.box}>
-
-        <TouchableOpacity
+          {/* <TouchableOpacity
           onPress={() => navigation.navigate("BYO Unsuccessful Screen")}
           style={styles.imagePlaceholder}
         >
@@ -107,12 +106,18 @@ export default function BYOScreen({ navigation }) {
           style={styles.imagePlaceholder}
         >
           <Text>(Selection screen)</Text>
-        </TouchableOpacity> 
+        </TouchableOpacity>  */}
           <Text style={styles.text}>Scan the QR code!</Text>
           <BarCodeScanner
             onBarCodeScanned={scanned ? undefined : handleBarCodeScanned}
             style={styles.qr}
           />
+          <TouchableOpacity
+            onPress={() => navigation.popToTop()}
+            style={[globalStyles.buttonTop, { marginTop: 30, width: "80%" }]}
+          >
+            <Text style={globalStyles.buttonText}>Back to Home </Text>
+          </TouchableOpacity>
         </View>
         <FooterText />
       </View>

diff --git a/screens/byo-screens/BYOSelectionScreen.js b/screens/byo-screens/BYOSelectionScreen.js
@@ -136,6 +136,12 @@ export default function BYOSelectionScreen({ navigation, route }) {
               setContainerNum={setContainerNum}
             />
             {renderNextButton()}
+            <TouchableOpacity
+              onPress={() => navigation.popToTop()}
+              style={[globalStyles.button, { width: "90%" }]}
+            >
+              <Text style={globalStyles.buttonText}>Cancel</Text>
+            </TouchableOpacity>
           </View>
           <FooterText />
         </View>