TW-1608: Remove 0xOptimal ads provider

src/app/pages/Home/OtherComponents/Tokens/Tokens.tsx

@@ -6,7 +6,6 @@ import clsx from 'clsx';
 import { SyncSpinner, Divider, Checkbox } from 'app/atoms';
 import DropdownWrapper from 'app/atoms/DropdownWrapper';
 import { useAppEnv } from 'app/env';
-import { useLoadPartnersPromo } from 'app/hooks/use-load-partners-promo';
 import { useTokensListingLogic } from 'app/hooks/use-tokens-listing-logic';
 import { ReactComponent as EditingIcon } from 'app/icons/editing.svg';
 import { ReactComponent as SearchIcon } from 'app/icons/search.svg';
@@ -21,7 +20,6 @@ import { ButtonForManageDropdown } from 'app/templates/ManageDropdown';
 import { PartnersPromotion, PartnersPromotionVariant } from 'app/templates/partners-promotion';
 import SearchAssetField from 'app/templates/SearchAssetField';
 import { setTestID } from 'lib/analytics';
-import { OptimalPromoVariantEnum } from 'lib/apis/optimal';
 import { TEZ_TOKEN_SLUG, TEMPLE_TOKEN_SLUG } from 'lib/assets';
 import { useEnabledAccountTokensSlugs } from 'lib/assets/hooks';
 import { RECENT_TERMS_VERSION } from 'lib/constants';
@@ -118,8 +116,6 @@ export const TokensTab = memo(() => {
     return tokensJsx;
   }, [filteredAssets, activeAssetSlug, publicKeyHash, mainnetTokensScamSlugsRecord]);
 
-  useLoadPartnersPromo(OptimalPromoVariantEnum.Token);
-
   useEffect(() => {
     if (activeIndex !== 0 && activeIndex >= filteredAssets.length) {
       setActiveIndex(0);

src/app/store/partners-promotion/actions.ts

@@ -1,22 +1,10 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import { OptimalPromotionType, OptimalPromoVariantEnum } from 'lib/apis/optimal';
-import { createActions } from 'lib/store';
-
 interface HidePromotionActionPayload {
   id: string;
   timestamp: number;
 }
 
-export const loadPartnersPromoAction = createActions<
-  {
-    optimalPromoVariantEnum: OptimalPromoVariantEnum;
-    accountAddress: string;
-  },
-  OptimalPromotionType,
-  string
->('partnersPromo/LOAD_PARTNERS');
-
 export const togglePartnersPromotionAction = createAction<boolean>('partnersPromo/TOGGLE_PARTNERS_PROMO');
 
 export const hidePromotionAction = createAction<HidePromotionActionPayload>('advertising/PROMOTION_HIDING');

src/app/store/partners-promotion/reducers.ts

@@ -3,24 +3,12 @@ import { persistReducer } from 'redux-persist';
 import hardSet from 'redux-persist/lib/stateReconciler/hardSet';
 
 import { AD_HIDING_TIMEOUT } from 'lib/constants';
-import { createEntity, storageConfig } from 'lib/store';
+import { storageConfig } from 'lib/store';
 
-import { hidePromotionAction, loadPartnersPromoAction, togglePartnersPromotionAction } from './actions';
+import { hidePromotionAction, togglePartnersPromotionAction } from './actions';
 import { partnersPromotionInitialState, PartnersPromotionState } from './state';
 
 const partnersPromotionReducer = createReducer(partnersPromotionInitialState, builder => {
-  builder.addCase(loadPartnersPromoAction.submit, state => ({
-    ...state,
-    promotion: createEntity(state.promotion.data, true)
-  }));
-  builder.addCase(loadPartnersPromoAction.success, (state, { payload }) => ({
-    ...state,
-    promotion: createEntity(payload, false)
-  }));
-  builder.addCase(loadPartnersPromoAction.fail, (state, { payload }) => ({
-    ...state,
-    promotion: createEntity(state.promotion.data, false, payload)
-  }));
   builder.addCase(togglePartnersPromotionAction, (state, { payload }) => ({
     ...state,
     shouldShowPromotion: payload,

src/app/store/partners-promotion/selectors.ts

@@ -1,7 +1,5 @@
 import { useSelector } from '..';
 
-export const usePartnersPromoSelector = () => useSelector(state => state.partnersPromotion.promotion);
-
 export const useShouldShowPartnersPromoSelector = () =>
   useSelector(({ partnersPromotion }) => partnersPromotion.shouldShowPromotion);
 

src/app/store/partners-promotion/state.mock.ts

@@ -1,29 +1,8 @@
-import { createEntity, mockPersistedState } from 'lib/store';
+import { mockPersistedState } from 'lib/store';
 
 import type { PartnersPromotionState } from './state';
 
-export const mockPartnersPromotion = {
-  body: '',
-  campaign_type: '',
-  copy: {
-    headline: '',
-    cta: '',
-    content: ''
-  },
-  display_type: '',
-  div_id: '',
-  html: [],
-  id: '',
-  image: '',
-  link: '',
-  nonce: '',
-  text: '',
-  view_time_url: '',
-  view_url: ''
-};
-
 export const mockPartnersPromotionState = mockPersistedState<PartnersPromotionState>({
-  promotion: createEntity(mockPartnersPromotion),
   shouldShowPromotion: true,
   promotionHidingTimestamps: {}
 });

src/app/store/partners-promotion/state.ts

@@ -1,16 +1,13 @@
-import { OptimalPromotionType } from 'lib/apis/optimal';
-import { LoadableEntityState, createEntity } from 'lib/store';
-
-import { mockPartnersPromotion } from './state.mock';
+import { LoadableEntityState } from 'lib/store';
 
 export interface PartnersPromotionState {
-  promotion: LoadableEntityState<OptimalPromotionType>;
+  /** @deprecated */
+  promotion?: LoadableEntityState<{}>;
   shouldShowPromotion: boolean;
   promotionHidingTimestamps: StringRecord<number>;
 }
 
 export const partnersPromotionInitialState: PartnersPromotionState = {
-  promotion: createEntity(mockPartnersPromotion),
   shouldShowPromotion: false,
   promotionHidingTimestamps: {}
 };

src/app/store/root-state.epics.ts

@@ -12,7 +12,6 @@ import { buyWithCreditCardEpics } from './buy-with-credit-card/epics';
 import { collectiblesEpics } from './collectibles/epics';
 import { collectiblesMetadataEpics } from './collectibles-metadata/epics';
 import { currencyEpics } from './currency/epics';
-import { partnersPromotionEpics } from './partners-promotion/epics';
 import type { RootState } from './root-state.type';
 import { swapEpics } from './swap/epics';
 import { tokensMetadataEpics } from './tokens-metadata/epics';
@@ -22,7 +21,6 @@ const allEpics = combineEpics(
   advertisingEpics,
   notificationsEpics,
   swapEpics,
-  partnersPromotionEpics,
   balancesEpics,
   assetsEpics,
   tokensMetadataEpics,

src/app/templates/activity/Activity.tsx

@@ -5,7 +5,6 @@ import InfiniteScroll from 'react-infinite-scroll-component';
 
 import { SyncSpinner } from 'app/atoms';
 import { useAppEnv } from 'app/env';
-import { useLoadPartnersPromo } from 'app/hooks/use-load-partners-promo';
 import { ReactComponent as LayersIcon } from 'app/icons/layers.svg';
 import { useShouldShowPartnersPromoSelector } from 'app/store/partners-promotion/selectors';
 import { PartnersPromotion, PartnersPromotionVariant } from 'app/templates/partners-promotion';
@@ -32,7 +31,6 @@ export const ActivityComponent: React.FC<Props> = ({ assetSlug }) => {
   const { publicKeyHash: accountAddress } = useAccount();
 
   const shouldShowPartnersPromo = useShouldShowPartnersPromoSelector();
-  useLoadPartnersPromo();
 
   const promotion = useMemo(() => {
     if (shouldShowPartnersPromo)

src/app/templates/partners-promotion/index.tsx

@@ -16,7 +16,6 @@ import { postAdImpression } from 'lib/apis/ads-api';
 import { AD_HIDING_TIMEOUT } from 'lib/constants';
 
 import { HypelabPromotion } from './components/hypelab-promotion';
-import { OptimalPromotion } from './components/optimal-promotion';
 import { PersonaPromotion } from './components/persona-promotion';
 import styles from './partners-promotion.module.css';
 import { PartnersPromotionVariant } from './types';
@@ -48,7 +47,7 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
   const isAnalyticsSentRef = useRef(false);
 
   const [isHiddenTemporarily, setIsHiddenTemporarily] = useState(shouldBeHiddenTemporarily(hiddenAt));
-  const [providerName, setProviderName] = useState<AdsProviderLocalName>('Optimal');
+  const [providerName, setProviderName] = useState<AdsProviderLocalName>('HypeLab');
   const [adError, setAdError] = useState(false);
   const [adIsReady, setAdIsReady] = useState(false);
 
@@ -85,7 +84,6 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
     [id, dispatch]
   );
 
-  const handleOptimalError = useCallback(() => setProviderName('HypeLab'), []);
   const handleHypelabError = useCallback(
     () => (withPersonaProvider ? setProviderName('Persona') : setAdError(true)),
     [withPersonaProvider]
@@ -107,18 +105,6 @@ export const PartnersPromotion = memo<PartnersPromotionProps>(({ variant, id, pa
     >
       {(() => {
         switch (providerName) {
-          case 'Optimal':
-            return (
-              <OptimalPromotion
-                variant={variant}
-                isVisible={adIsReady}
-                pageName={pageName}
-                onAdRectSeen={handleAdRectSeen}
-                onClose={handleClosePartnersPromoClick}
-                onReady={handleAdReady}
-                onError={handleOptimalError}
-              />
-            );
           case 'HypeLab':
             return (
               <HypelabPromotion

src/lib/ads/index.ts

@@ -1,5 +1,4 @@
 export enum AdsProviderTitle {
-  Optimal = 'Optimal',
   HypeLab = 'HypeLab',
   Persona = 'Persona',
   Temple = 'Temple Wallet'