Release 1.19.11 (#1102)

Merge pull request #1102 from madfish-solutions/development
madfish-solutions · Mar 5, 2024 · 5e05cb7 · 5e05cb7
2 parents e5a1fef + 6f8f239
commit 5e05cb7
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "temple-wallet",
-  "version": "1.19.10",
+  "version": "1.19.11",
   "private": true,
   "scripts": {
     "start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",

diff --git a/...app/templates/partners-promotion/components/hypelab-promotion/hypelab-image-promotion.tsx b/...app/templates/partners-promotion/components/hypelab-promotion/hypelab-image-promotion.tsx
@@ -20,6 +20,8 @@ const bannerIsDisplayed = (element: BannerElement) => {
 const adAttributesObserverOptions = { attributes: true };
 
 export const HypelabImagePromotion: FC<Omit<SingleProviderPromotionProps, 'variant'>> = ({
+  providerTitle,
+  pageName,
   isVisible,
   onAdRectSeen,
   onClose,
@@ -79,6 +81,8 @@ export const HypelabImagePromotion: FC<Omit<SingleProviderPromotionProps, 'varia
 
   return (
     <ImagePromotionView
+      pageName={pageName}
+      providerTitle={providerTitle}
       onClose={onClose}
       href={currentAd?.cta_url ?? '#'}
       isVisible={isVisible}

diff --git a/src/app/templates/partners-promotion/components/hypelab-promotion/hypelab-text-promotion.tsx b/src/app/templates/partners-promotion/components/hypelab-promotion/hypelab-text-promotion.tsx
@@ -19,6 +19,8 @@ const dummyImageSrc =
   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==';
 
 export const HypelabTextPromotion: FC<Omit<SingleProviderPromotionProps, 'variant'>> = ({
+  providerTitle,
+  pageName,
   isVisible,
   onAdRectSeen,
   onClose,
@@ -45,6 +47,8 @@ export const HypelabTextPromotion: FC<Omit<SingleProviderPromotionProps, 'varian
     <Native placement={EnvVars.HYPELAB_NATIVE_PLACEMENT_SLUG} ref={hypelabNativeElementRef}>
       <span className="hidden" ref={hypelabHeadlineRef} data-ref="headline" />
       <TextPromotionView
+        pageName={pageName}
+        providerTitle={providerTitle}
         href={currentAd?.cta_url ?? '/'}
         imageSrc={currentAd?.creative_set.icon.url ?? dummyImageSrc}
         isVisible={isVisible}

diff --git a/src/app/templates/partners-promotion/components/image-promotion-view.tsx b/src/app/templates/partners-promotion/components/image-promotion-view.tsx
@@ -1,32 +1,44 @@
-import React, { FC, MouseEventHandler, PropsWithChildren, useRef } from 'react';
+import React, { FC, MouseEventHandler, PropsWithChildren, useMemo, useRef } from 'react';
 
 import clsx from 'clsx';
 
 import { Anchor } from 'app/atoms/Anchor';
 import { useAdRectObservation } from 'app/hooks/ads/use-ad-rect-observation';
+import { useAccount } from 'lib/temple/front';
 
 import { PartnersPromotionSelectors } from '../index.selectors';
 import { PartnersPromotionVariant } from '../types';
 
 import { CloseButton } from './close-button';
 
 interface TextPromotionViewProps extends PropsWithChildren {
+  pageName: string;
+  providerTitle: string;
   href: string;
   isVisible: boolean;
   onAdRectSeen: EmptyFn;
   onClose: MouseEventHandler<HTMLButtonElement>;
 }
 
 export const ImagePromotionView: FC<TextPromotionViewProps> = ({
+  pageName,
+  providerTitle,
   children,
   href,
   isVisible,
   onAdRectSeen,
   onClose
 }) => {
+  const { publicKeyHash: accountPkh } = useAccount();
+
   const ref = useRef<HTMLAnchorElement>(null);
   useAdRectObservation(ref, onAdRectSeen, isVisible);
 
+  const testIDProperties = useMemo(
+    () => ({ variant: PartnersPromotionVariant.Image, page: pageName, provider: providerTitle, href, accountPkh }),
+    [href, accountPkh, providerTitle, pageName]
+  );
+
   return (
     <Anchor
       className={clsx(
@@ -39,7 +51,7 @@ export const ImagePromotionView: FC<TextPromotionViewProps> = ({
       rel="noreferrer"
       ref={ref}
       testID={PartnersPromotionSelectors.promoLink}
-      testIDProperties={{ variant: PartnersPromotionVariant.Image, href }}
+      testIDProperties={testIDProperties}
     >
       {children}
 

diff --git a/src/app/templates/partners-promotion/components/optimal-promotion.tsx b/src/app/templates/partners-promotion/components/optimal-promotion.tsx
@@ -11,8 +11,10 @@ import { ImagePromotionView } from './image-promotion-view';
 import { TextPromotionView } from './text-promotion-view';
 
 export const OptimalPromotion: FC<SingleProviderPromotionProps> = ({
-  isVisible,
   variant,
+  providerTitle,
+  pageName,
+  isVisible,
   onAdRectSeen,
   onClose,
   onReady,
@@ -64,14 +66,23 @@ export const OptimalPromotion: FC<SingleProviderPromotionProps> = ({
 
   if (variant === PartnersPromotionVariant.Image) {
     return (
-      <ImagePromotionView onClose={onClose} onAdRectSeen={onAdRectSeen} href={href} isVisible={isVisible}>
+      <ImagePromotionView
+        pageName={pageName}
+        providerTitle={providerTitle}
+        onClose={onClose}
+        onAdRectSeen={onAdRectSeen}
+        href={href}
+        isVisible={isVisible}
+      >
         <img src={imageSrc} alt="Partners promotion" className="shadow-lg rounded-lg" onError={onImageError} />
       </ImagePromotionView>
     );
   }
 
   return (
     <TextPromotionView
+      pageName={pageName}
+      providerTitle={providerTitle}
       href={href}
       imageSrc={imageSrc}
       isVisible={isVisible}

diff --git a/src/app/templates/partners-promotion/components/text-promotion-view.tsx b/src/app/templates/partners-promotion/components/text-promotion-view.tsx
@@ -5,13 +5,16 @@ import clsx from 'clsx';
 import { Anchor } from 'app/atoms/Anchor';
 import { useAppEnv } from 'app/env';
 import { useAdRectObservation } from 'app/hooks/ads/use-ad-rect-observation';
+import { useAccount } from 'lib/temple/front';
 
 import { PartnersPromotionSelectors } from '../index.selectors';
 import { PartnersPromotionVariant } from '../types';
 
 import { CloseButton } from './close-button';
 
 interface TextPromotionViewProps {
+  pageName: string;
+  providerTitle: string;
   href: string;
   isVisible: boolean;
   imageSrc: string;
@@ -23,8 +26,21 @@ interface TextPromotionViewProps {
 }
 
 export const TextPromotionView = memo<TextPromotionViewProps>(
-  ({ imageSrc, href, headline, isVisible, contentText = '', onAdRectSeen, onImageError, onClose }) => {
+  ({
+    pageName,
+    providerTitle,
+    imageSrc,
+    href,
+    headline,
+    isVisible,
+    contentText = '',
+    onAdRectSeen,
+    onImageError,
+    onClose
+  }) => {
     const { popup } = useAppEnv();
+    const { publicKeyHash: accountPkh } = useAccount();
+
     const truncatedContentText = useMemo(
       () => (contentText.length > 80 ? `${contentText.slice(0, 80)}...` : contentText),
       [contentText]
@@ -33,6 +49,11 @@ export const TextPromotionView = memo<TextPromotionViewProps>(
     const ref = useRef<HTMLAnchorElement>(null);
     useAdRectObservation(ref, onAdRectSeen, isVisible);
 
+    const testIDProperties = useMemo(
+      () => ({ variant: PartnersPromotionVariant.Text, page: pageName, provider: providerTitle, href, accountPkh }),
+      [href, accountPkh, providerTitle, pageName]
+    );
+
     return (
       <Anchor
         className={clsx(
@@ -45,7 +66,7 @@ export const TextPromotionView = memo<TextPromotionViewProps>(
         rel="noreferrer"
         ref={ref}
         testID={PartnersPromotionSelectors.promoLink}
-        testIDProperties={{ variant: PartnersPromotionVariant.Text, href }}
+        testIDProperties={testIDProperties}
       >
         <div className="flex items-center justify-start gap-2.5 p-4 max-w-sm w-full">
           <div className="self-stretch">

diff --git a/src/app/templates/partners-promotion/index.tsx b/src/app/templates/partners-promotion/index.tsx
@@ -13,6 +13,7 @@ import {
 } from 'app/store/partners-promotion/selectors';
 import { AnalyticsEventCategory, useAnalytics } from 'lib/analytics';
 import { AD_HIDING_TIMEOUT } from 'lib/constants';
+import { useAccount } from 'lib/temple/front';
 
 import { HypelabPromotion } from './components/hypelab-promotion';
 import { OptimalPromotion } from './components/optimal-promotion';
@@ -34,6 +35,7 @@ const shouldBeHiddenTemporarily = (hiddenAt: number) => {
 
 export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pageName }) => {
   const isImageAd = variant === PartnersPromotionVariant.Image;
+  const { publicKeyHash: accountPkh } = useAccount();
   const { trackEvent } = useAnalytics();
   const { popup } = useAppEnv();
   const dispatch = useDispatch();
@@ -46,6 +48,8 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
   const [adError, setAdError] = useState(false);
   const [adIsReady, setAdIsReady] = useState(false);
 
+  const providerTitle = shouldUseOptimalAd ? 'Optimal' : 'HypeLab';
+
   useEffect(() => {
     const newIsHiddenTemporarily = shouldBeHiddenTemporarily(hiddenAt);
     setIsHiddenTemporarily(newIsHiddenTemporarily);
@@ -65,9 +69,14 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
   const handleAdRectSeen = useCallback(() => {
     if (lastReportedPageName !== pageName) {
       dispatch(setLastReportedPageNameAction(pageName));
-      trackEvent('Internal Ads Activity', AnalyticsEventCategory.General, { page: pageName });
+      trackEvent('Internal Ads Activity', AnalyticsEventCategory.General, {
+        variant,
+        page: pageName,
+        provider: providerTitle,
+        accountPkh
+      });
     }
-  }, [dispatch, lastReportedPageName, pageName, trackEvent]);
+  }, [providerTitle, lastReportedPageName, variant, pageName, accountPkh, trackEvent, dispatch]);
 
   const handleClosePartnersPromoClick = useCallback<MouseEventHandler<HTMLButtonElement>>(
     e => {
@@ -92,6 +101,8 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
       {shouldUseOptimalAd ? (
         <OptimalPromotion
           variant={variant}
+          providerTitle={providerTitle}
+          pageName={pageName}
           isVisible={adIsReady}
           onAdRectSeen={handleAdRectSeen}
           onClose={handleClosePartnersPromoClick}
@@ -101,6 +112,8 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
       ) : (
         <HypelabPromotion
           variant={variant}
+          providerTitle={providerTitle}
+          pageName={pageName}
           isVisible={adIsReady}
           onAdRectSeen={handleAdRectSeen}
           onClose={handleClosePartnersPromoClick}

diff --git a/src/app/templates/partners-promotion/types.ts b/src/app/templates/partners-promotion/types.ts
@@ -7,6 +7,8 @@ export enum PartnersPromotionVariant {
 
 export interface SingleProviderPromotionProps {
   variant: PartnersPromotionVariant;
+  pageName: string;
+  providerTitle: string;
   isVisible: boolean;
   onClose: MouseEventHandler<HTMLButtonElement>;
   onReady: EmptyFn;