Merge fixes with latest prod version, since qa seems broken

UseHover · Nov 17, 2023 · bd93697 · bd93697
1 parent 418b1fd
commit bd93697
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/qa-release.yml b/.github/workflows/qa-release.yml
@@ -48,7 +48,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           # Can be overridden with the desired gradle version
-          gradle-version: 7.4
+          gradle-version: 7.6
           # Specifies the gradle command to be run, can be replaced with any desired task
           arguments: bundleProductionRelease
 

diff --git a/app/src/main/java/com/hover/stax/presentation/bounties/BountyApplicationFragment.kt b/app/src/main/java/com/hover/stax/presentation/bounties/BountyApplicationFragment.kt
@@ -28,17 +28,16 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import com.hover.stax.R
 import com.hover.stax.databinding.FragmentBountyApplicationBinding
-import com.hover.stax.storage.user.entity.StaxUser
 import com.hover.stax.home.MainActivity
 import com.hover.stax.login.LoginScreenUiState
 import com.hover.stax.login.LoginUiState
 import com.hover.stax.login.LoginViewModel
+import com.hover.stax.storage.user.entity.StaxUser
 import com.hover.stax.utils.AnalyticsUtil.logAnalyticsEvent
 import com.hover.stax.utils.NavUtil
 import com.hover.stax.utils.network.NetworkMonitor
 import com.hover.stax.views.StaxDialog
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
@@ -88,8 +87,8 @@ class BountyApplicationFragment : Fragment(), View.OnClickListener {
                     visibility = View.VISIBLE
                     text = getString(R.string.signed_in_as, staxUser.email)
                 }
+                NavUtil.navigate(findNavController(), BountyApplicationFragmentDirections.actionBountyApplicationFragmentToBountyListFragment())
             }
-            staxUser != null && staxUser.isMapper -> NavUtil.navigate(findNavController(), BountyApplicationFragmentDirections.actionBountyApplicationFragmentToBountyListFragment())
             else -> {
                 signedInDetails.visibility = View.GONE
                 btnSignIn.apply {