Merge branch 'fix-disappearing-account-input-when-history-is-empty'

1 files changed, 4 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
index 7d21f0298b..9b2178b0b2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
@@ -59,9 +59,9 @@ class AccountLogin : RelativeLayout {
         get() = MAX_ACCOUNT_HISTORY_ENTRIES * (historyEntryHeight + dividerHeight)
 
     private val expandedHeight: Int
-        get() = collapsedHeight + historyHeight
+        get() = collapsedHeight + (historyHeight ?: 0)
 
-    private var historyHeight by observable(0) { _, oldHistoryHeight, newHistoryHeight ->
+    private var historyHeight by observable<Int?>(null) { _, oldHistoryHeight, newHistoryHeight ->
         if (newHistoryHeight != oldHistoryHeight) {
             historyAnimation.setIntValues(collapsedHeight, expandedHeight)
             reposition()
@@ -173,6 +173,8 @@ class AccountLogin : RelativeLayout {
                 }
             )
         }
+
+        historyAnimation.setIntValues(collapsedHeight, expandedHeight)
     }
 
     fun onDestroy() {