Update Rewards Activities (#1921)

* update rewards activities * fix: resolve comments
push-protocol · Oct 15, 2024 · c586fd8 · c586fd8
1 parent 628b2dd
commit c586fd8
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 10 deletions.
diff --git a/src/blocks/illustrations/components/CyberLogoRewards.tsx b/src/blocks/illustrations/components/CyberLogoRewards.tsx
diff --git a/src/blocks/illustrations/index.ts b/src/blocks/illustrations/index.ts
@@ -25,6 +25,8 @@ export { default as CommunicationDark } from './components/CommunicationDark';
 
 export { default as CreateChannelPoints } from './components/CreateChannelPoints';
 
+export { default as CyberLogoRewards } from './components/CyberLogoRewards';
+
 export { default as Discord } from './components/Discord';
 
 export { default as EarnOnPush } from './components/EarnOnPush';

diff --git a/src/modules/rewards/components/RewardsActivityIcon.tsx b/src/modules/rewards/components/RewardsActivityIcon.tsx
@@ -28,6 +28,7 @@ import {
   Twitter,
   YellowBonusActivitySubscribers,
   PushAlpha,
+  CyberLogoRewards,
 } from 'blocks';
 import { quickSwapLogo, priceTrackerLogo, walletTrackerLogo, shapeShiftLogo } from 'common';
 import { ActvityType } from 'queries';
@@ -207,6 +208,15 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
     );
   }
 
+  if (type === 'channel_specific_subscriptions:CYBER_CHANNEL') {
+    return (
+      <CyberLogoRewards
+        width={48}
+        height={48}
+      />
+    );
+  }
+
   if (type === 'stake_1_uni_v2_lp_epoch' || type === 'stake_1k_push_epoch') {
     return (
       <StakePushGreyCoin

diff --git a/src/modules/rewards/components/RewardsActivityTitle.tsx b/src/modules/rewards/components/RewardsActivityTitle.tsx
@@ -22,7 +22,7 @@ const RewardsActivityTitle: FC<RewardsActivityTitleProps> = ({ activityTitle, is
   const extractedTitle = getRewardsActivityTitle(activityTitle);
 
   if (extractedTitle) {
-    const { preText, url, linkedText, postText } = extractedTitle;
+    const { preText, url, linkedText, postText, secondLinkedText, secondUrl, innerText } = extractedTitle;
     return (
       <Skeleton isLoading={isLoading}>
         <Box
@@ -50,6 +50,31 @@ const RewardsActivityTitle: FC<RewardsActivityTitleProps> = ({ activityTitle, is
             {linkedText}
           </Link>
 
+          {innerText && (
+            <Text
+              variant={variant || 'bl-semibold'}
+              color={color || 'text-primary'}
+              as="span"
+            >
+              {innerText}
+            </Text>
+          )}
+
+          {secondLinkedText && secondUrl && (
+            <Link
+              to={secondUrl}
+              isText
+              target="_blank"
+              textProps={{
+                variant: variant || 'bl-semibold',
+                color: 'text-brand-medium',
+                display: 'inline-block',
+              }}
+            >
+              {secondLinkedText}
+            </Link>
+          )}
+
           <Text
             variant={variant || 'bl-semibold'}
             color={color || 'text-primary'}

diff --git a/src/modules/rewards/utils/activityTypeArray.ts b/src/modules/rewards/utils/activityTypeArray.ts
@@ -15,6 +15,7 @@ export const channelSubscriptionActivities: ActvityType[] = [
   'channel_specific_subscriptions:QUICKSWAP_CHANNEL',
   'channel_specific_subscriptions:WALLETTRACKER_CHANNEL',
   'channel_specific_subscriptions:SHAPESHIFT_CHANNEL',
+  'channel_specific_subscriptions:CYBER_CHANNEL',
 ];
 
 export const bonusRewardActivities: ActvityType[] = [

diff --git a/src/modules/rewards/utils/getRewardsActivityTitle.ts b/src/modules/rewards/utils/getRewardsActivityTitle.ts
@@ -1,19 +1,36 @@
 export const getRewardsActivityTitle = (activityTitle: string) => {
-  const regex = /\[([^\]]+)\]\(([^)]+)\)/;
-  const match = activityTitle?.match(regex);
-  if (match) {
-    const preText = activityTitle.substring(0, match.index);
-    const linkedText = match[1];
-    const url = match[2];
+  if (!activityTitle) return null; // Ensure activityTitle is not null or undefined
+
+  const regex = /\[([^\]]+)\]\(([^)]+)\)/g;
+  const matches = Array.from(activityTitle.matchAll(regex)); // Convert iterator to an array
+
+  if (matches.length >= 1) {
+    const preText = activityTitle.substring(0, matches[0].index);
+    const linkedText = matches[0][1];
+    const url = matches[0][2];
+
+    let innerText = '';
+    let secondLinkedText = '';
+    let secondUrl = '';
     let postText = '';
-    if (match.index) {
-      postText = activityTitle.substring(match.index + match[0].length);
+
+    if (matches.length >= 2) {
+      innerText = activityTitle.substring(matches[0].index + matches[0][0].length, matches[1].index);
+      secondLinkedText = matches[1][1];
+      secondUrl = matches[1][2];
+      postText = activityTitle.substring(matches[1].index + matches[1][0].length);
+    } else {
+      postText = activityTitle.substring(matches[0].index + matches[0][0].length);
     }
+
     return {
       preText,
       linkedText,
       url,
-      postText
+      innerText,
+      secondLinkedText,
+      secondUrl,
+      postText,
     };
   } else {
     return null;

diff --git a/src/queries/types/rewards.ts b/src/queries/types/rewards.ts
@@ -35,6 +35,7 @@ export type ActvityType =
   | 'channel_specific_subscriptions:WALLETTRACKER_CHANNEL'
   | 'channel_specific_subscriptions:PRICETRACKER_CHANNEL'
   | 'channel_specific_subscriptions:SHAPESHIFT_CHANNEL'
+  | 'channel_specific_subscriptions:CYBER_CHANNEL'
   | 'stake_1k_push_epoch'
   | 'stake_5k_push_epoch'
   | 'stake_10k_push_epoch'