Merge pull request #1864 from session-foundation/fix-pro-issues-7

fix: more pro qa issues fix 7

Author: Bilb

ts/components/dialog/user-settings/pages/user-pro/ProNonOriginatingPage.tsx

@@ -192,7 +192,13 @@ function ProInfoBlockDeviceLinked() {
   );
 }
 
-function ProInfoBlockWebsite({ textElement }: { textElement: ReactNode }) {
+function ProInfoBlockWebsite({
+  textElement,
+  titleType,
+}: {
+  textElement: ReactNode;
+  titleType: 'via' | 'onThe';
+}) {
   const { data } = useProBackendProDetailsLocal();
   const storeOrPlatform = useStoreOrPlatformFromProvider(data);
 
@@ -202,7 +208,7 @@ function ProInfoBlockWebsite({ textElement }: { textElement: ReactNode }) {
       textElement={
         <ProInfoBlockText>
           <strong>
-            {tr('viaStoreWebsite', {
+            {tr(titleType === 'via' ? 'viaStoreWebsite' : 'onPlatformWebsite', {
               platform: storeOrPlatform,
             })}
           </strong>
@@ -305,6 +311,7 @@ function ProInfoBlockUpdate() {
             }
           />
           <ProInfoBlockWebsite
+            titleType="via"
             textElement={
               <Localizer
                 token="viaStoreWebsiteDescription"
@@ -347,6 +354,7 @@ function ProInfoBlockRenew() {
         <>
           <ProInfoBlockDeviceLinked />
           <ProInfoBlockWebsite
+            titleType="onThe"
             textElement={
               <Localizer
                 token="proAccessRenewPlatformStoreWebsite"
@@ -363,6 +371,8 @@ function ProInfoBlockRenew() {
 
 function ProInfoBlockCancel() {
   const { data } = useProBackendProDetailsLocal();
+  const storeOrPlatform = useStoreOrPlatformFromProvider(data);
+
   return (
     <ProInfoBlockLayout
       titleElement={tr('proCancellation')}
@@ -387,10 +397,11 @@ function ProInfoBlockCancel() {
             }
           />
           <ProInfoBlockWebsite
+            titleType="onThe"
             textElement={
               <Localizer
                 token="cancelProPlatformStore"
-                platform_store={data.providerConstants.platform}
+                platform_store={storeOrPlatform}
                 platform_account={data.providerConstants.platform_account}
               />
             }
@@ -472,6 +483,7 @@ function ProInfoBlockRefundIOS() {
             }
           />
           <ProInfoBlockWebsite
+            titleType="onThe"
             textElement={
               <Localizer
                 token="requestRefundPlatformWebsite"

ts/components/dialog/user-settings/pages/user-pro/ProSettingsPage.tsx

@@ -492,8 +492,6 @@ function ProSettings({ state }: SectionProps) {
     subText = { token: 'errorLoadingProAccess' };
   } else if (isLoading) {
     subText = { token: 'proAccessLoadingEllipsis' };
-  } else if (data.isProcessingRefund) {
-    subText = { token: 'processingRefundRequest', platform: data.providerConstants.platform };
   } else if (data.inGracePeriod) {
     subText = { token: 'proRenewalUnsuccessful' };
   } else if (data.autoRenew) {
@@ -509,6 +507,10 @@ function ProSettings({ state }: SectionProps) {
         {data.isProcessingRefund ? (
           <PanelIconButton
             text={{ token: 'proRequestedRefund' }}
+            subText={{
+              token: 'processingRefundRequest',
+              platform: data.providerConstants.platform,
+            }}
             dataTestId="update-access-settings-button"
             onClick={handleUpdateAccessClick}
             iconElement={<PanelIconLucideIcon unicode={LUCIDE_ICONS_UNICODE.CIRCLE_ALERT} />}