Update trial usage card stories

The following discussion from !14412 should be addressed:

• @kpalchyk started a discussion: (+10 comments)

Tim or Bryan noticed on a sync that in the last state, the "accept on-demand" card should not show up, which is probably an issue in data. Probably the canAcceptOverageTerms field.

polish: There was an issue in my data, that the canAcceptOverageTerms should be false for when overage or commitment are enabled. Also, Waiver, in theory, can apply only when overage is enabled.

Here's a small patch to update these scenarios:

diff

diff --git a/spec/frontend/subscription/usage/mock_data.js b/spec/frontend/subscription/usage/mock_data.js
index 2af50a5891..5fbeed46bf 100644
--- a/spec/frontend/subscription/usage/mock_data.js
+++ b/spec/frontend/subscription/usage/mock_data.js
@@ -329,41 +329,37 @@ export const usageDataPaidTierTrialWithoutCanAcceptOverage = merge({}, usageData
   },
 });
 
-export const usageDataPaidTierTrialWithCommitment = merge({}, usageDataPaidTierTrial, {
-  subscription: {
-    gitlabCreditsUsage: {
-      monthlyCommitment: {
-        creditsUsed: 0,
-        totalCredits: 100,
-        dailyUsage: [],
-      },
-    },
-  },
-});
-
-export const usageDataPaidTierTrialWithWaiver = merge({}, usageDataPaidTierTrial, {
-  subscription: {
-    gitlabCreditsUsage: {
-      monthlyWaiver: {
-        totalCredits: 100,
-        creditsUsed: 100,
-        dailyUsage: [],
+export const usageDataPaidTierTrialWithOverage = merge(
+  {},
+  usageDataPaidTierTrialWithoutCanAcceptOverage,
+  {
+    subscription: {
+      gitlabCreditsUsage: {
+        overage: {
+          isAllowed: true,
+          creditsUsed: 0,
+          dailyUsage: [],
+        },
       },
     },
   },
-});
+);
 
-export const usageDataPaidTierTrialWithOverage = merge({}, usageDataPaidTierTrial, {
-  subscription: {
-    gitlabCreditsUsage: {
-      overage: {
-        isAllowed: true,
-        creditsUsed: 0,
-        dailyUsage: [],
+export const usageDataPaidTierTrialWithOverageWithWaiver = merge(
+  {},
+  usageDataPaidTierTrialWithOverage,
+  {
+    subscription: {
+      gitlabCreditsUsage: {
+        monthlyWaiver: {
+          totalCredits: 100,
+          creditsUsed: 100,
+          dailyUsage: [],
+        },
       },
     },
   },
-});
+);
 
 export const usageDataPaidTierTrialWithCommitmentWithOverage = merge(
   {},
diff --git a/stories/subscription/usage/app.stories.js b/stories/subscription/usage/app.stories.js
index c1bb6c8562..f77b7490bb 100644
--- a/stories/subscription/usage/app.stories.js
+++ b/stories/subscription/usage/app.stories.js
@@ -18,9 +18,8 @@ import {
   usageDataPaidTierTrial,
   activeTrialDetailsResponse,
   usageDataPaidTierTrialWithoutCanAcceptOverage,
-  usageDataPaidTierTrialWithCommitment,
   usageDataPaidTierTrialWithCommitmentWithOverage,
-  usageDataPaidTierTrialWithWaiver,
+  usageDataPaidTierTrialWithOverageWithWaiver,
   usageDataPaidTierTrialWithOverage,
 } from '../../../spec/frontend/subscription/usage/mock_data';
 
@@ -118,12 +117,8 @@ export const PaidTierTrialWithOverage = createTemplate({
   response: usageDataPaidTierTrialWithOverage,
 }).bind({});
 
-export const PaidTierTrialWithCommitment = createTemplate({
-  response: usageDataPaidTierTrialWithCommitment,
-}).bind({});
-
-export const PaidTierTrialWithWaiver = createTemplate({
-  response: usageDataPaidTierTrialWithWaiver,
+export const PaidTierTrialWithOverageWithWaiver = createTemplate({
+  response: usageDataPaidTierTrialWithOverageWithWaiver,
 }).bind({});
 
 export const PaidTierTrialWithCommitmentWithOverage = createTemplate({