Merge pull request #154 from code-payments/chore/open-currency-selector-in-same-stack

bmc08gt · web-flow · commit 88fadc04c73d · 2024-02-08T11:56:49.000-05:00
chore: open currency selector in same stack instead of new sheet
diff --git a/app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt b/app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt
@@ -301,7 +301,7 @@ data object CurrencySelectionModal: MainGraph, ModalRoot {
     override fun Content() {
         val navigator = LocalCodeNavigator.current
         ModalContainer(
-            closeButton = {
+            backButton = {
                 if (navigator.isVisible) {
                     it is CurrencySelectionModal
                 } else {
diff --git a/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAmount.kt b/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAmount.kt
@@ -64,7 +64,7 @@ fun AccountWithdrawAmount(
                 isAnimated = true,
                 textStyle = CodeTheme.typography.displayLarge,
                 ) {
-                navigator.show(CurrencySelectionModal)
+                navigator.push(CurrencySelectionModal)
             }
         }
 
diff --git a/app/src/main/java/com/getcode/view/main/giveKin/GiveKinSheet.kt b/app/src/main/java/com/getcode/view/main/giveKin/GiveKinSheet.kt
@@ -70,7 +70,7 @@ fun GiveKinSheet(
                 modifier = Modifier
                     .align(Alignment.Center)
             ) {
-                navigator.show(CurrencySelectionModal)
+                navigator.push(CurrencySelectionModal)
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ fun AccountWithdrawAmount(`
`64`	`64`	`isAnimated = true,`
`65`	`65`	`textStyle = CodeTheme.typography.displayLarge,`
`66`	`66`	`) {`
`67`		`- navigator.show(CurrencySelectionModal)`
	`67`	`+ navigator.push(CurrencySelectionModal)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ fun GiveKinSheet(`
`70`	`70`	`modifier = Modifier`
`71`	`71`	`.align(Alignment.Center)`
`72`	`72`	`) {`
`73`		`- navigator.show(CurrencySelectionModal)`
	`73`	`+ navigator.push(CurrencySelectionModal)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`