diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt index 311b8c9..9cf4d1c 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt @@ -76,9 +76,9 @@ fun BottomBar() { val title = if (selectedAccount == null) { "Bankmeister" } else if (selectedAccount.bankAccount != null) { - selectedAccount.bankAccount.productName ?: selectedAccount.bankAccount.identifier + selectedAccount.bankAccount.displayName } else { - selectedAccount.userAccount.bankName + selectedAccount.userAccount.displayName } Text(title, color = color, maxLines = 1, overflow = TextOverflow.Ellipsis) diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/composables/BanksList.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/composables/BanksList.kt index 516992a..b448a3d 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/composables/BanksList.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/composables/BanksList.kt @@ -37,12 +37,12 @@ fun BanksList( userAccounts.value.sortedBy { it.displayIndex }.forEach { userAccount -> Spacer(Modifier.fillMaxWidth().height(12.dp)) - NavigationMenuItem(itemModifier, userAccount.bankName, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, userAccount, iconResource = Res.drawable.account) { + NavigationMenuItem(itemModifier, userAccount.displayName, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, userAccount, iconResource = Res.drawable.account) { accountSelected?.invoke(userAccount, null) } userAccount.accounts.sortedBy { it.displayIndex }.forEach { account -> - NavigationMenuItem(itemModifier, account.productName ?: account.identifier, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, bankAccount = account) { + NavigationMenuItem(itemModifier, account.displayName, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, bankAccount = account) { accountSelected?.invoke(userAccount, account) } } diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt index d1af010..36dc375 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt @@ -71,7 +71,7 @@ fun EnterTanDialog(tanChallengeReceived: TanChallengeReceived, onDismiss: () -> Row { BankIcon(challenge.user, Modifier.padding(end = 6.dp)) - Text("${challenge.user.bankName}, Nutzer ${challenge.user.loginName}${challenge.account?.let { ", Konto ${it.productName ?: it.identifier}" } ?: ""}") + Text("${challenge.user.displayName}, Nutzer ${challenge.user.loginName}${challenge.account?.let { ", Konto ${it.productName ?: it.identifier}" } ?: ""}") } Text( "TAN benötigt ${Internationalization.getTextForActionRequiringTan(challenge.forAction)}",