merge cherry-picking

app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt

@@ -88,18 +88,15 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 		return when (row) {
 			SimpleRow.NAME -> if (bankroll.name.isNotEmpty()) bankroll.name else NULL_TEXT
 			BankrollRow.CURRENCY -> {
-				bankroll.currency?.let {
+				bankroll.currency?.code?.let { code ->
-					Currency.getInstance(it.code).currencyCode
+					Currency.getInstance(code).currencyCode
 				} ?: run {
 					NULL_TEXT
 				}
 			}
 			BankrollRow.RATE -> {
-				this.bankroll.currency?.rate?.let { rate ->
+				val rate = this.bankroll.currency?.rate ?: 1.0
-                    rate.toRate()
+				rate.toRate()
-				} ?: run {
-                    1.0.toRate()
-				}
 			}
 			else -> super.stringForRow(row)
 		}