Skip to content

Balance Header not displayed in Send and Receive sheet #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovitrif merged 2 commits into from
May 13, 2025
Merged

Balance Header not displayed in Send and Receive sheet #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c4199
fix: provide currencyViewModel and currency UI State as local composi…
jvsena42 May 13, 2025
d53fca4
Merge branch 'master' into fix/provides-currency-vm-transaction-sheet
jvsena42 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ class MainActivity : FragmentActivity() {
)

if (appViewModel.showNewTransaction) {
NewTransactionSheet(appViewModel)
NewTransactionSheet(appViewModel = appViewModel, currencyViewModel = currencyViewModel)
}

SplashScreen(appViewModel.splashVisible)
Expand Down
30 changes: 21 additions & 9 deletions app/src/main/java/to/bitkit/ui/screens/wallets/sheets/NewTransactionSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -32,6 +34,8 @@ import to.bitkit.R
import to.bitkit.models.NewTransactionSheetDetails
import to.bitkit.models.NewTransactionSheetDirection
import to.bitkit.models.NewTransactionSheetType
import to.bitkit.ui.LocalCurrencies
import to.bitkit.ui.LocalCurrencyViewModel
import to.bitkit.ui.components.BalanceHeaderView
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.SecondaryButton
Expand All @@ -42,21 +46,29 @@ import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.ModalSheetTopPadding
import to.bitkit.ui.utils.localizedRandom
import to.bitkit.viewmodels.AppViewModel
import to.bitkit.viewmodels.CurrencyViewModel

@Composable
fun NewTransactionSheet(
appViewModel: AppViewModel,
currencyViewModel: CurrencyViewModel
) {
val currencies by currencyViewModel.uiState.collectAsState()

NewTransactionSheet(
onDismissRequest = { appViewModel.hideNewTransactionSheet() },
details = appViewModel.newTransaction,
onCloseClick = { appViewModel.hideNewTransactionSheet() },
onDetailClick = {
appViewModel.hideNewTransactionSheet()
appViewModel.onClickActivityDetail()
},
)
CompositionLocalProvider(
LocalCurrencyViewModel provides currencyViewModel,
LocalCurrencies provides currencies,
) {
NewTransactionSheet(
onDismissRequest = { appViewModel.hideNewTransactionSheet() },
details = appViewModel.newTransaction,
onCloseClick = { appViewModel.hideNewTransactionSheet() },
onDetailClick = {
appViewModel.hideNewTransactionSheet()
appViewModel.onClickActivityDetail()
},
)
}
}

@OptIn(ExperimentalMaterial3Api::class)
Expand Down