From ffadfef14359dde7457d1ced8df5cc1201a89f80 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 15 Apr 2019 17:20:28 +0200 Subject: [PATCH] Solving conflict --- .../android/ui/fragment/BankrollDataFragment.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt index 1f02d4ec..277a3b1c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt @@ -117,12 +117,8 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS return when (row) { SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.bankroll.name)) BankrollRow.RATE -> { - - this.bankroll.currency?.rate?.let { rate -> - row.editingDescriptors(mapOf("defaultValue" to rate.toRate())) - } ?: run { - row.editingDescriptors(mapOf()) - } + val rate = this.bankroll.currency?.rate ?: 1.0 + row.editingDescriptors(mapOf("defaultValue" to rate.toRate())) } else -> null }