Skip to content

Commit a836c55

Browse files
authored
fix(data-consent): Fix non touch customers seeing msa prompt (#87133)
Non touch customers were seeing the MSA guard, this should fix that.
1 parent b7fc82d commit a836c55

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

static/gsApp/views/legalAndCompliance/dataConsent.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ const formGroups: JsonFormObject[] = [
2929
),
3030
}
3131
),
32-
disabled: ({hasMsaUpdated, hasBillingAccess, isSuperuser}) =>
33-
(!hasMsaUpdated || !hasBillingAccess) && !isSuperuser,
34-
disabledReason: ({hasMsaUpdated, hasBillingAccess}) =>
35-
hasMsaUpdated
36-
? hasBillingAccess
32+
disabled: ({isTouchCustomerAndNeedsMsaUpdate, hasBillingAccess, isSuperuser}) =>
33+
(isTouchCustomerAndNeedsMsaUpdate || !hasBillingAccess) && !isSuperuser,
34+
disabledReason: ({isTouchCustomerAndNeedsMsaUpdate, hasBillingAccess}) =>
35+
isTouchCustomerAndNeedsMsaUpdate
36+
? t(
37+
'These changes require updates to your account. Please contact your customer success manager to learn more.'
38+
)
39+
: hasBillingAccess
3740
? null
3841
: t(
3942
"You don't have access to manage these billing and subscription details."
40-
)
41-
: t(
42-
'These changes require updates to your account. Please contact your customer success manager to learn more.'
43-
),
43+
),
4444
},
4545
{
4646
name: 'genAIConsent',

static/gsApp/views/legalAndCompliance/dataConsentForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function DataConsentForm({subscription}: {subscription: Subscription}) {
2222
isUsRegion,
2323
hasBillingAccess,
2424
isSuperuser,
25-
hasMsaUpdated,
25+
isTouchCustomerAndNeedsMsaUpdate,
2626
} = useGenAiConsentButtonAccess({
2727
subscription,
2828
});
@@ -67,7 +67,7 @@ function DataConsentForm({subscription}: {subscription: Subscription}) {
6767
isUsRegion,
6868
hasBillingAccess,
6969
isSuperuser,
70-
hasMsaUpdated,
70+
isTouchCustomerAndNeedsMsaUpdate,
7171
}}
7272
forms={DataConsentFields}
7373
/>

0 commit comments

Comments
 (0)