Merge remote-tracking branch 'origin/TW-821-stable-diffusion-integrat…

…ion' into TW-877-change-seach-ux-in-dapps-page

src/components/accept-ads-banner/accept-ads-banner.tsx

@@ -1,16 +1,24 @@
 import React, { FC } from 'react';
+import { View, Text, StyleProp, ViewStyle } from 'react-native';
 import { useDispatch } from 'react-redux';
 
 import { togglePartnersPromotionAction } from 'src/store/partners-promotion/partners-promotion-actions';
 import { setAdsBannerVisibilityAction } from 'src/store/settings/settings-actions';
+import { formatSize } from 'src/styles/format-size';
 
-import { ABContainer } from '../ab-container/ab-container';
-import { AGroupBanner } from './a-group-banner/a-group-banner';
-import { BannerProps } from './accept-ads-banner.props';
-import { BGroupBanner } from './b-group-banner/b-group-banner';
+import { ButtonLargePrimary } from '../button/button-large/button-large-primary/button-large-primary';
+import { ButtonLargeSecondary } from '../button/button-large/button-large-secondary/button-large-secondary';
+import { Divider } from '../divider/divider';
+import { AcceptAdsBannerSelectors } from './accept-ads-banner.selectors';
+import { useCommonBannerStyles } from './common-banner.styles';
+
+interface BannerProps {
+  style?: StyleProp<ViewStyle>;
+}
 
 export const AcceptAdsBanner: FC<BannerProps> = ({ style }) => {
   const dispatch = useDispatch();
+  const commonStyles = useCommonBannerStyles();
 
   const handleDisableBannerButton = () => {
     dispatch(togglePartnersPromotionAction(false));
@@ -23,13 +31,29 @@ export const AcceptAdsBanner: FC<BannerProps> = ({ style }) => {
   };
 
   return (
-    <ABContainer
-      groupAComponent={
-        <AGroupBanner style={style} onDisable={handleDisableBannerButton} onEnable={handleEnableBannerButton} />
-      }
-      groupBComponent={
-        <BGroupBanner style={style} onDisable={handleDisableBannerButton} onEnable={handleEnableBannerButton} />
-      }
-    />
+    <View style={[commonStyles.root, style]}>
+      <Text style={commonStyles.title}>Get paid to discover exciting services and dApps! 👀💰</Text>
+      <Text style={commonStyles.description}>
+        Here's the deal: share some data with us (wallet address, IP) to see the most relevant ads and we'll *pay you* a
+        fair share monthly. By doing so, you support the developers of Temple Wallet. Change your mind? Easily disable
+        sharing in settings.
+      </Text>
+      <Text style={commonStyles.description}>Start earning now!</Text>
+      <ButtonLargeSecondary
+        title="No thanks"
+        onPress={handleDisableBannerButton}
+        textStyle={commonStyles.buttonText}
+        buttonStyle={commonStyles.button}
+        testID={AcceptAdsBannerSelectors.aGroupDisable}
+      />
+      <Divider size={formatSize(8)} />
+      <ButtonLargePrimary
+        title="Pay me for every ad I see"
+        onPress={handleEnableBannerButton}
+        textStyle={commonStyles.buttonText}
+        buttonStyle={commonStyles.button}
+        testID={AcceptAdsBannerSelectors.aGroupEnable}
+      />
+    </View>
   );
 };

src/screens/d-apps/d-apps.tsx

@@ -61,8 +61,6 @@ export const DApps = () => {
     }
   }, [partnersPromotionEnabled, isEnabledAdsBanner]);
 
-  usePageAnalytic(ScreensEnum.DApps);
-
   const sortedDAppsList = useMemo(() => {
     if (isDefined(searchValue)) {
       return dAppsList.filter(dapp => dapp.name.toLowerCase().includes(searchValue.toLowerCase()));