Merge branch 'main' into release/1.4.0

Concordium · Nov 29, 2024 · f5605eb · f5605eb
2 parents 5384a42 + 67c0ee9
commit f5605eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...c/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsOverviewFragment.kt b/...c/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountsOverviewFragment.kt
@@ -10,7 +10,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
-import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.AccelerateInterpolator
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
@@ -102,13 +101,13 @@ class AccountsOverviewFragment : BaseFragment() {
             }
         }
 
-        baseActivity.hideQrScan(isVisible = true)
-        if (!mainViewModel.hasCompletedOnboarding()) {
-            baseActivity.hideQrScan(isVisible = true) {
+        baseActivity.hideQrScan(isVisible = true) {
+            if (mainViewModel.hasCompletedOnboarding()) {
+                baseActivity.startQrScanner()
+            } else {
                 baseActivity.showUnlockFeatureDialog()
             }
         }
-
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/com/concordium/wallet/ui/base/BaseActivity.kt b/app/src/main/java/com/concordium/wallet/ui/base/BaseActivity.kt
@@ -244,7 +244,7 @@ abstract class BaseActivity(
             }
         }
 
-    private fun startQrScanner() {
+    fun startQrScanner() {
         val intent = Intent(applicationContext, ScanQRActivity::class.java)
         intent.putExtra(EXTRA_QR_CONNECT, true)
         scanQrResult.launch(intent)