Skip to content

Commit 42ed334

Browse files
authored
Merge pull request #140 from synonymdev/fix/provides-currency-vm-transaction-sheet
Balance Header not displayed in Send and Receive sheet
2 parents 4391cb0 + d53fca4 commit 42ed334

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

app/src/main/java/to/bitkit/ui/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ class MainActivity : FragmentActivity() {
237237
)
238238

239239
if (appViewModel.showNewTransaction) {
240-
NewTransactionSheet(appViewModel)
240+
NewTransactionSheet(appViewModel = appViewModel, currencyViewModel = currencyViewModel)
241241
}
242242

243243
SplashScreen(appViewModel.splashVisible)

app/src/main/java/to/bitkit/ui/screens/wallets/sheets/NewTransactionSheet.kt

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import androidx.compose.material3.MaterialTheme
1515
import androidx.compose.material3.ModalBottomSheet
1616
import androidx.compose.material3.rememberModalBottomSheetState
1717
import androidx.compose.runtime.Composable
18+
import androidx.compose.runtime.CompositionLocalProvider
1819
import androidx.compose.runtime.LaunchedEffect
20+
import androidx.compose.runtime.collectAsState
1921
import androidx.compose.runtime.getValue
2022
import androidx.compose.ui.Alignment
2123
import androidx.compose.ui.Modifier
@@ -32,6 +34,8 @@ import to.bitkit.R
3234
import to.bitkit.models.NewTransactionSheetDetails
3335
import to.bitkit.models.NewTransactionSheetDirection
3436
import to.bitkit.models.NewTransactionSheetType
37+
import to.bitkit.ui.LocalCurrencies
38+
import to.bitkit.ui.LocalCurrencyViewModel
3539
import to.bitkit.ui.components.BalanceHeaderView
3640
import to.bitkit.ui.components.PrimaryButton
3741
import to.bitkit.ui.components.SecondaryButton
@@ -42,21 +46,29 @@ import to.bitkit.ui.theme.AppThemeSurface
4246
import to.bitkit.ui.theme.ModalSheetTopPadding
4347
import to.bitkit.ui.utils.localizedRandom
4448
import to.bitkit.viewmodels.AppViewModel
49+
import to.bitkit.viewmodels.CurrencyViewModel
4550

4651
@Composable
4752
fun NewTransactionSheet(
4853
appViewModel: AppViewModel,
54+
currencyViewModel: CurrencyViewModel
4955
) {
56+
val currencies by currencyViewModel.uiState.collectAsState()
5057

51-
NewTransactionSheet(
52-
onDismissRequest = { appViewModel.hideNewTransactionSheet() },
53-
details = appViewModel.newTransaction,
54-
onCloseClick = { appViewModel.hideNewTransactionSheet() },
55-
onDetailClick = {
56-
appViewModel.hideNewTransactionSheet()
57-
appViewModel.onClickActivityDetail()
58-
},
59-
)
58+
CompositionLocalProvider(
59+
LocalCurrencyViewModel provides currencyViewModel,
60+
LocalCurrencies provides currencies,
61+
) {
62+
NewTransactionSheet(
63+
onDismissRequest = { appViewModel.hideNewTransactionSheet() },
64+
details = appViewModel.newTransaction,
65+
onCloseClick = { appViewModel.hideNewTransactionSheet() },
66+
onDetailClick = {
67+
appViewModel.hideNewTransactionSheet()
68+
appViewModel.onClickActivityDetail()
69+
},
70+
)
71+
}
6072
}
6173

6274
@OptIn(ExperimentalMaterial3Api::class)

0 commit comments

Comments
 (0)