MBL-2041: Clean up feature flag for refactor fix payment

app/src/main/java/com/kickstarter/libs/featureflag/FeatureFlagClient.kt

@@ -78,7 +78,6 @@ enum class FlagKey(val key: String) {
     ANDROID_STRIPE_LINK("android_stripe_link"),
     ANDROID_PLEDGED_PROJECTS_OVERVIEW("android_pledged_projects_overview"),
     ANDROID_PLEDGE_REDEMPTION("android_pledge_redemption"),
-    ANDROID_FIX_PLEDGE_REFACTOR("android_fix_pledge_refactor"),
     ANDROID_PLEDGE_OVER_TIME("android_pledge_over_time")
 }
 

app/src/main/java/com/kickstarter/libs/utils/extensions/FragmentExt.kt

@@ -6,20 +6,12 @@ import com.kickstarter.ui.ArgumentsKey
 import com.kickstarter.ui.data.PledgeData
 import com.kickstarter.ui.data.PledgeReason
 import com.kickstarter.ui.fragments.CrowdfundCheckoutFragment
-import com.kickstarter.ui.fragments.PledgeFragment
 
 fun Fragment.selectPledgeFragment(
     pledgeData: PledgeData,
-    pledgeReason: PledgeReason,
-    ffEnabled: Boolean = false
+    pledgeReason: PledgeReason
 ): Fragment {
-    val fragment = when (pledgeReason) {
-        PledgeReason.FIX_PLEDGE ->
-            if (ffEnabled) CrowdfundCheckoutFragment()
-            else PledgeFragment()
-        else -> CrowdfundCheckoutFragment()
-    }
-
+    val fragment = CrowdfundCheckoutFragment()
     return fragment.withData(pledgeData, pledgeReason)
 }
 

app/src/main/java/com/kickstarter/ui/activities/ProjectPageActivity.kt

@@ -50,8 +50,6 @@ import com.kickstarter.libs.Environment
 import com.kickstarter.libs.KSString
 import com.kickstarter.libs.MessagePreviousScreenType
 import com.kickstarter.libs.ProjectPagerTabs
-import com.kickstarter.libs.featureflag.FeatureFlagClientType
-import com.kickstarter.libs.featureflag.FlagKey
 import com.kickstarter.libs.utils.ApplicationUtils
 import com.kickstarter.libs.utils.UrlUtils
 import com.kickstarter.libs.utils.ViewUtils
@@ -87,7 +85,6 @@ import com.kickstarter.ui.extensions.startUpdatesActivity
 import com.kickstarter.ui.extensions.startVideoActivity
 import com.kickstarter.ui.fragments.BackingFragment
 import com.kickstarter.ui.fragments.CancelPledgeFragment
-import com.kickstarter.ui.fragments.PledgeFragment
 import com.kickstarter.ui.fragments.RewardsFragment
 import com.kickstarter.utils.WindowInsetsUtil
 import com.kickstarter.viewmodels.projectpage.AddOnsViewModel
@@ -111,10 +108,16 @@ import kotlinx.coroutines.launch
 
 const val REFRESH = "refresh"
 
+interface PledgeDelegate {
+    fun pledgePaymentSuccessfullyUpdated()
+    fun pledgeSuccessfullyCreated(checkoutDataAndPledgeData: Pair<CheckoutData, PledgeData>)
+    fun pledgeSuccessfullyUpdated()
+}
+
 class ProjectPageActivity :
     AppCompatActivity(),
     CancelPledgeFragment.CancelPledgeDelegate,
-    PledgeFragment.PledgeDelegate,
+    PledgeDelegate,
     BackingFragment.BackingDelegate {
     private lateinit var ksString: KSString
 
@@ -398,7 +401,7 @@ class ProjectPageActivity :
 
         this.viewModel.outputs.showUpdatePledge()
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { showPledgeFragment(it, ffClient) }
+            .subscribe { showPledgeFragment(it) }
             .addToDisposable(disposables)
 
         this.viewModel.outputs.startRootCommentsActivity()
@@ -1154,11 +1157,9 @@ class ProjectPageActivity :
             .show()
     }
     private fun showPledgeFragment(
-        pledgeDataAndPledgeReason: Pair<PledgeData, PledgeReason>,
-        ffClient: FeatureFlagClientType
+        pledgeDataAndPledgeReason: Pair<PledgeData, PledgeReason>
     ) {
-        val ffEnabled = ffClient.getBoolean(FlagKey.ANDROID_FIX_PLEDGE_REFACTOR)
-        val pledgeFragment = this.selectPledgeFragment(pledgeDataAndPledgeReason.first, pledgeDataAndPledgeReason.second, ffEnabled)
+        val pledgeFragment = this.selectPledgeFragment(pledgeDataAndPledgeReason.first, pledgeDataAndPledgeReason.second)
         val tag = pledgeFragment::class.java.simpleName
         supportFragmentManager
             .beginTransaction()

app/src/main/java/com/kickstarter/ui/extensions/ActivityExt.kt

@@ -45,7 +45,6 @@ import com.kickstarter.ui.data.PledgeData
 import com.kickstarter.ui.data.PledgeReason
 import com.kickstarter.ui.data.ProjectData
 import com.kickstarter.ui.fragments.CrowdfundCheckoutFragment
-import com.kickstarter.ui.fragments.PledgeFragment
 import timber.log.Timber
 
 fun Activity.startActivityWithTransition(
@@ -78,15 +77,9 @@ fun Activity.hideKeyboard() {
 
 fun Activity.selectPledgeFragment(
     pledgeData: PledgeData,
-    pledgeReason: PledgeReason,
-    ffEnabled: Boolean = false
+    pledgeReason: PledgeReason
 ): Fragment {
-    val fragment = when (pledgeReason) {
-        PledgeReason.FIX_PLEDGE ->
-            if (ffEnabled) CrowdfundCheckoutFragment()
-            else PledgeFragment()
-        else -> CrowdfundCheckoutFragment()
-    }
+    val fragment = CrowdfundCheckoutFragment()
     return fragment.withData(pledgeData, pledgeReason)
 }
 

app/src/main/java/com/kickstarter/ui/fragments/BackingAddOnsFragment.kt

@@ -15,8 +15,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.kickstarter.R
 import com.kickstarter.databinding.FragmentBackingAddonsBinding
-import com.kickstarter.libs.featureflag.FeatureFlagClientType
-import com.kickstarter.libs.featureflag.FlagKey
 import com.kickstarter.libs.utils.extensions.getEnvironment
 import com.kickstarter.libs.utils.extensions.selectPledgeFragment
 import com.kickstarter.ui.ArgumentsKey
@@ -99,8 +97,7 @@ class BackingAddOnsFragment : Fragment() {
                                     viewModelC.getPledgeDataAndReason()?.let { pDataAndReason ->
                                         showPledgeFragment(
                                             pledgeData = pDataAndReason.first,
-                                            pledgeReason = pDataAndReason.second,
-                                            ffClient = ffClient
+                                            pledgeReason = pDataAndReason.second
                                         )
                                     }
                                 } else {
@@ -123,11 +120,9 @@ class BackingAddOnsFragment : Fragment() {
 
     private fun showPledgeFragment(
         pledgeData: PledgeData,
-        pledgeReason: PledgeReason,
-        ffClient: FeatureFlagClientType
+        pledgeReason: PledgeReason
     ) {
-        val ffEnabled = ffClient.getBoolean(FlagKey.ANDROID_FIX_PLEDGE_REFACTOR)
-        val fragment = this.selectPledgeFragment(pledgeData, pledgeReason, ffEnabled)
+        val fragment = this.selectPledgeFragment(pledgeData, pledgeReason)
         parentFragmentManager
             .beginTransaction()
             .setCustomAnimations(R.anim.slide_up, 0, 0, R.anim.slide_down)

app/src/main/java/com/kickstarter/ui/fragments/CrowdfundCheckoutFragment.kt

@@ -23,14 +23,14 @@ import com.kickstarter.models.Reward
 import com.kickstarter.models.StoredCard
 import com.kickstarter.models.chrome.ChromeTabsHelperActivity
 import com.kickstarter.ui.activities.DisclaimerItems
+import com.kickstarter.ui.activities.PledgeDelegate
 import com.kickstarter.ui.activities.compose.projectpage.CheckoutScreen
 import com.kickstarter.ui.activities.compose.projectpage.getRewardListAndPrices
 import com.kickstarter.ui.compose.designsystem.KSTheme
 import com.kickstarter.ui.compose.designsystem.KickstarterApp
 import com.kickstarter.ui.data.PledgeReason
 import com.kickstarter.ui.extensions.showErrorToast
 import com.kickstarter.ui.extensions.startDisclaimerChromeTab
-import com.kickstarter.ui.fragments.PledgeFragment.PledgeDelegate
 import com.kickstarter.viewmodels.projectpage.CheckoutUIState
 import com.kickstarter.viewmodels.projectpage.CrowdfundCheckoutViewModel
 import com.kickstarter.viewmodels.projectpage.CrowdfundCheckoutViewModel.Factory