fix(🐛): AND-6775 firebase bugfixes (#4112)

blockchain · Nov 17, 2022 · 73f7db3 · 73f7db3
1 parent 180c046
commit 73f7db3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/.../java/piuk/blockchain/android/ui/transfer/receive/detail/AddressInfoReceiveBottomSheet.kt b/.../java/piuk/blockchain/android/ui/transfer/receive/detail/AddressInfoReceiveBottomSheet.kt
@@ -11,16 +11,10 @@ import piuk.blockchain.android.R
 
 class AddressInfoReceiveBottomSheet : ComposeModalBottomDialog() {
 
-    override val host: Host by lazy {
-        activity as? Host ?: parentFragment as? Host ?: throw IllegalStateException(
-            "Host is not a AddressInfoReceiveBottomSheet.Host"
-        )
-    }
-
     val displayTicker: String
         get() = arguments?.getString(TICKER).orEmpty()
 
-    val label: String?
+    val label: String
         get() = arguments?.getString(LABEL).orEmpty()
 
     override val makeSheetNonCollapsible: Boolean

diff --git a/...main/java/piuk/blockchain/android/ui/transfer/receive/detail/MultichainInfoBottomSheet.kt b/...main/java/piuk/blockchain/android/ui/transfer/receive/detail/MultichainInfoBottomSheet.kt
@@ -17,12 +17,6 @@ import piuk.blockchain.android.util.putAccount
 
 class MultichainInfoBottomSheet : ComposeModalBottomDialog() {
 
-    override val host: Host by lazy {
-        activity as? Host ?: parentFragment as? Host ?: throw IllegalStateException(
-            "Host is not a MultichainInfoBottomSheet.Host"
-        )
-    }
-
     val account: CryptoAccount?
         get() = arguments?.getAccount(PARAM_ACCOUNT) as? CryptoAccount
 

diff --git a/...src/main/java/piuk/blockchain/android/ui/transfer/receive/detail/ReceiveDetailActivity.kt b/...src/main/java/piuk/blockchain/android/ui/transfer/receive/detail/ReceiveDetailActivity.kt
@@ -9,6 +9,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.blockchain.analytics.events.RequestAnalyticsEvents
 import com.blockchain.coincore.CryptoAccount
+import com.blockchain.commonarch.presentation.base.SlidingModalBottomDialog
 import com.blockchain.commonarch.presentation.mvi.MviActivity
 import com.blockchain.componentlib.basic.ImageResource
 import com.blockchain.componentlib.button.ButtonState
@@ -31,7 +32,8 @@ import piuk.blockchain.android.util.getAccount
 import piuk.blockchain.android.util.putAccount
 
 class ReceiveDetailActivity :
-    MviActivity<ReceiveDetailModel, ReceiveDetailIntent, ReceiveDetailState, ActivityReceiveDetailsBinding>() {
+    MviActivity<ReceiveDetailModel, ReceiveDetailIntent, ReceiveDetailState, ActivityReceiveDetailsBinding>(),
+    SlidingModalBottomDialog.Host {
     override val model: ReceiveDetailModel by scopedInject()
     private val encoder: QRCodeEncoder by inject()
 
@@ -224,4 +226,8 @@ class ReceiveDetailActivity :
                 putAccount(PARAM_ACCOUNT, account)
             }
     }
+
+    override fun onSheetClosed() {
+        // do nothing
+    }
 }
diff --git a/...c/main/java/piuk/blockchain/android/ui/transfer/receive/detail/ShareAddressBottomSheet.kt b/...c/main/java/piuk/blockchain/android/ui/transfer/receive/detail/ShareAddressBottomSheet.kt
@@ -29,12 +29,6 @@ internal class ShareAddressBottomSheet :
 
     private var qrBitmap: Bitmap? = null
 
-    override val host: Host by lazy {
-        activity as? Host ?: parentFragment as? Host ?: throw IllegalStateException(
-            "Host is not a ShareAddressBottomSheet.Host"
-        )
-    }
-
     val account: CryptoAccount?
         get() = arguments?.getAccount(PARAM_ACCOUNT) as? CryptoAccount