update icons batch 2

src/blocks/illustrations/components/StakePushOrangeDoubleStarMultiplier.tsx

@@ -0,0 +1,94 @@
+import { FC } from 'react';
+import { IllustrationWrapper } from '../IllustrationWrapper';
+import { IllustrationProps } from '../Illustrations.types';
+
+const StakePushOrangeDoubleStarMultiplier: FC<IllustrationProps> = (allProps) => {
+ const { svgProps: props, ...restProps } = allProps;
+ return (
+ <IllustrationWrapper
+ componentName="StakePushOrangeDoubleStarMultiplier"
+ illustration={
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ width={restProps?.width ?? '24'}
+ height={restProps?.height ?? '24'}
+ viewBox="0 0 48 48"
+ fill="none"
+ {...props}
+ >
+ <path
+ d="M3.81299 11.5575C3.81299 7.5934 7.0265 4.37988 10.9906 4.37988H37.0093C40.9733 4.37988 44.1868 7.59339 44.1868 11.5575V28.0714C44.1868 30.3588 43.0966 32.5092 41.2515 33.8611L28.1848 43.4355C27.0159 44.292 25.6044 44.7537 24.1553 44.7537C22.7274 44.7537 21.3356 44.3054 20.1762 43.472L6.80132 33.8583C4.92522 32.5098 3.81299 30.3406 3.81299 28.0301V11.5575Z"
+ fill="black"
+ />
+ <path
+ d="M3.81299 14.1463C3.81299 10.1823 7.0265 6.96875 10.9906 6.96875H37.0093C40.9733 6.96875 44.1868 10.1823 44.1868 14.1463V30.6603C44.1868 32.9476 43.0966 35.098 41.2515 36.45L28.1848 46.0243C27.0159 46.8808 25.6044 47.3426 24.1553 47.3426C22.7274 47.3426 21.3356 46.8943 20.1762 46.0609L6.80132 36.4472C4.92522 35.0986 3.81299 32.9295 3.81299 30.619V14.1463Z"
+ fill="#EF9D7B"
+ />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M10.9907 0.566895H37.0093C43.0793 0.566895 48 5.48758 48 11.5575V28.0715C48 31.574 46.3306 34.8668 43.5053 36.937L30.4386 46.5113C28.6159 47.8469 26.415 48.5669 24.1554 48.5669C21.9289 48.5669 19.7587 47.8678 17.9508 46.5683L4.57588 36.9546C1.7031 34.8897 0 31.5681 0 28.0302V11.5576C0 5.48759 4.92068 0.566895 10.9907 0.566895ZM10.9907 4.37998C7.02659 4.37998 3.81308 7.59349 3.81308 11.5576V28.0302C3.81308 30.3407 4.92531 32.5099 6.80141 33.8584L20.1763 43.4721C21.3357 44.3055 22.7275 44.7538 24.1554 44.7538C25.6045 44.7538 27.016 44.2921 28.1849 43.4356L41.2516 33.8612C43.0967 32.5093 44.1869 30.3589 44.1869 28.0715V11.5575C44.1869 7.59349 40.9734 4.37998 37.0093 4.37998H10.9907Z"
+ fill="#EF9D7B"
+ />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M26.1927 44.4422C25.5373 44.6474 24.8507 44.7537 24.1553 44.7537C22.7274 44.7537 21.3356 44.3054 20.1762 43.472L7.96729 34.6964V19.3877H26.1927V44.4422Z"
+ fill="url(#paint0_linear_8618_11686)"
+ fill-opacity="0.6"
+ />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M40.68 34.2799L28.772 43.0053V23.4297H40.68V34.2799Z"
+ fill="url(#paint1_linear_8618_11686)"
+ fill-opacity="0.6"
+ />
+ <path
+ d="M25.6069 18.7057C25.6069 18.7057 25.0306 18.5134 24.2302 18.2468C21.4692 17.3265 19.2713 15.1287 18.351 12.3678C18.0845 11.5672 17.8922 10.9909 17.8922 10.9909C17.7756 10.6413 17.4483 10.4055 17.0797 10.4055C16.7112 10.4055 16.384 10.6414 16.2673 10.991C16.2673 10.991 16.0751 11.5672 15.8086 12.3676C14.8883 15.1286 12.6904 17.3265 9.92956 18.2468C9.12896 18.5134 8.55269 18.7057 8.55269 18.7057C8.20309 18.8223 7.96729 19.1495 7.96729 19.5181C7.96729 19.8866 8.20315 20.2139 8.55275 20.3305C8.55275 20.3305 9.12902 20.5227 9.92933 20.7892C12.6904 21.7095 14.8883 23.9074 15.8086 26.6682C16.0751 27.4688 16.2673 28.0451 16.2673 28.0451C16.384 28.3947 16.7111 28.6306 17.0797 28.6306C17.4483 28.6306 17.7756 28.3947 17.8922 28.0451C17.8922 28.0451 18.0845 27.4689 18.351 26.6684C19.2714 23.9075 21.4692 21.7095 24.23 20.7893C25.0306 20.5227 25.6069 20.3305 25.6069 20.3305C25.9565 20.2139 26.1924 19.8867 26.1924 19.5181C26.1924 19.1495 25.9565 18.8223 25.6069 18.7057Z"
+ fill="white"
+ />
+ <path
+ d="M40.2976 22.8991C40.2976 22.8991 39.9211 22.7735 39.3981 22.5993C37.5941 21.998 36.158 20.5619 35.5567 18.758C35.3825 18.2349 35.2569 17.8583 35.2569 17.8583C35.1807 17.6299 34.9668 17.4758 34.726 17.4758C34.4852 17.4758 34.2714 17.6299 34.1952 17.8584C34.1952 17.8584 34.0696 18.2349 33.8955 18.7579C33.2941 20.5619 31.8581 21.998 30.0541 22.5993C29.531 22.7735 29.1545 22.8991 29.1545 22.8991C28.926 22.9753 28.772 23.1891 28.772 23.43C28.772 23.6708 28.9261 23.8846 29.1545 23.9608C29.1545 23.9608 29.531 24.0864 30.054 24.2605C31.858 24.8618 33.2941 26.2979 33.8954 28.1018C34.0696 28.6249 34.1952 29.0015 34.1952 29.0015C34.2714 29.2299 34.4852 29.384 34.726 29.384H34.7261C34.9669 29.384 35.1807 29.2299 35.2569 29.0015C35.2569 29.0015 35.3825 28.625 35.5567 28.102C36.158 26.2979 37.5941 24.8618 39.398 24.2605C39.9211 24.0864 40.2976 23.9608 40.2976 23.9608C40.5261 23.8846 40.6802 23.6708 40.6802 23.43C40.6802 23.1891 40.5261 22.9753 40.2976 22.8991Z"
+ fill="white"
+ />
+ <defs>
+ <linearGradient
+ id="paint0_linear_8618_11686"
+ x1="17.08"
+ y1="19.3877"
+ x2="17.08"
+ y2="44.7537"
+ gradientUnits="userSpaceOnUse"
+ >
+ <stop stop-color="#FFF8A9" />
+ <stop
+ offset="1"
+ stop-color="white"
+ stop-opacity="0"
+ />
+ </linearGradient>
+ <linearGradient
+ id="paint1_linear_8618_11686"
+ x1="34.726"
+ y1="23.4297"
+ x2="34.726"
+ y2="43.0053"
+ gradientUnits="userSpaceOnUse"
+ >
+ <stop stop-color="#FFF8A9" />
+ <stop
+ offset="1"
+ stop-color="white"
+ stop-opacity="0"
+ />
+ </linearGradient>
+ </defs>
+ </svg>
+ }
+ {...restProps}
+ />
+ );
+};
+
+export default StakePushOrangeDoubleStarMultiplier;

src/blocks/illustrations/components/StakePushOrangeMultiplier.tsx

@@ -2,11 +2,11 @@ import { FC } from 'react';
 import { IllustrationWrapper } from '../IllustrationWrapper';
 import { IllustrationProps } from '../Illustrations.types';
 
-const StakePushGreyMultiplier: FC<IllustrationProps> = (allProps) => {
+const StakePushOrangeMultiplier: FC<IllustrationProps> = (allProps) => {
  const { svgProps: props, ...restProps } = allProps;
  return (
  <IllustrationWrapper
- componentName="StakePushGreyMultiplier"
+ componentName="StakePushOrangeMultiplier"
  illustration={
  <svg
  xmlns="http://www.w3.org/2000/svg"
@@ -65,4 +65,4 @@ const StakePushGreyMultiplier: FC<IllustrationProps> = (allProps) => {
  );
 };
 
-export default StakePushGreyMultiplier;
+export default StakePushOrangeMultiplier;

src/blocks/illustrations/components/StakePushPurpleCoin.tsx

@@ -0,0 +1,78 @@
+import { FC } from 'react';
+import { IllustrationWrapper } from '../IllustrationWrapper';
+import { IllustrationProps } from '../Illustrations.types';
+
+const StakePushPurpleCoin: FC<IllustrationProps> = (allProps) => {
+ const { svgProps: props, ...restProps } = allProps;
+ return (
+ <IllustrationWrapper
+ componentName="StakePushPurpleCoin"
+ illustration={
+ <svg
+ width={restProps?.width ?? '24'}
+ height={restProps?.height ?? '24'}
+ viewBox="0 0 48 48"
+ fill="none"
+ {...props}
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <ellipse
+ cx="24"
+ cy="26.0035"
+ rx="24"
+ ry="22.5634"
+ fill="black"
+ />
+ <ellipse
+ cx="24"
+ cy="23.2313"
+ rx="24"
+ ry="22.6644"
+ fill="#DB88F0"
+ />
+ <ellipse
+ cx="23.8184"
+ cy="23.0629"
+ rx="19.6577"
+ ry="18.5638"
+ fill="black"
+ />
+ <ellipse
+ cx="23.8184"
+ cy="25.5991"
+ rx="19.6577"
+ ry="18.8792"
+ fill="#DB88F0"
+ />
+ <path
+ d="M24.0003 36.5917C25.3975 36.5917 26.5967 35.7546 27.1296 34.5554C27.2589 34.2634 27.0431 33.9347 26.7239 33.9347H21.2773C20.9581 33.9347 20.741 34.2627 20.8716 34.5554C21.4045 35.7546 22.6037 36.5917 24.0009 36.5917"
+ fill="white"
+ />
+ <path
+ d="M31.7673 30.3544C30.944 30.3544 30.277 29.6873 30.277 28.8641V23.4504C30.277 20.5166 28.2631 18.0539 25.543 17.3666C25.4431 16.5933 24.7836 15.9945 23.9825 15.9945C23.1814 15.9945 22.5169 16.5983 22.4214 17.3761C19.9801 18.0096 18.1174 20.0759 17.7823 22.624C17.7773 22.6614 17.7722 22.698 17.7678 22.736C17.7614 22.7865 17.7564 22.8365 17.7526 22.8877C17.7488 22.9389 17.7444 22.9895 17.7412 23.0401C17.738 23.0831 17.7349 23.1242 17.733 23.1672C17.7292 23.2525 17.7267 23.3392 17.7267 23.4264V28.8635C17.7267 29.6829 17.0659 30.3474 16.2477 30.3538C15.8576 30.3569 15.5352 30.6579 15.5352 31.0493V31.0556C15.5352 31.4426 15.8494 31.7568 16.2364 31.7568H31.7641C32.1511 31.7568 32.4653 31.4426 32.4653 31.0556C32.4672 30.6693 32.153 30.355 31.766 30.355L31.7673 30.3544Z"
+ fill="white"
+ />
+ <path
+ d="M28.8388 16.322C30.7186 16.7249 32.1539 18.3426 32.3309 20.2578C32.3506 20.4701 32.5357 20.6287 32.7522 20.6076C32.8549 20.5981 32.9482 20.5484 33.0149 20.4694C33.0802 20.3898 33.1122 20.2891 33.1026 20.1863C32.9985 19.0681 32.548 18.0343 31.7987 17.1938C31.0548 16.3615 30.0877 15.7979 29.0008 15.5645C28.9736 15.5591 28.9464 15.5557 28.9198 15.5557C28.7415 15.5557 28.5795 15.6802 28.5414 15.8619C28.4965 16.0709 28.6299 16.2764 28.8388 16.3213V16.322Z"
+ fill="white"
+ />
+ <path
+ d="M29.2735 13.8296C32.1979 14.4564 34.4329 16.9752 34.7092 19.9534C34.729 20.1657 34.9141 20.323 35.1305 20.3032C35.2333 20.2937 35.3265 20.244 35.3932 20.1651C35.4585 20.0854 35.4905 19.9847 35.481 19.8819C35.3292 18.2356 34.6636 16.7104 33.5584 15.4738C32.462 14.2461 31.0362 13.4158 29.4368 13.0721C29.4096 13.0666 29.3823 13.0632 29.3558 13.0632C29.1775 13.0632 29.0155 13.1878 28.9774 13.3695C28.9311 13.5784 29.0652 13.784 29.2741 13.8289L29.2735 13.8296Z"
+ fill="white"
+ />
+ <path
+ d="M19.1595 16.3218C19.3685 16.2769 19.5019 16.07 19.457 15.8611C19.4175 15.6794 19.2569 15.5548 19.0785 15.5548C19.052 15.5548 19.0248 15.5582 18.9976 15.5637C17.9114 15.7964 16.9443 16.3599 16.1997 17.193C15.4504 18.0321 14.9985 19.0673 14.8957 20.1855C14.8862 20.2882 14.9175 20.389 14.9835 20.4686C15.0488 20.5482 15.1435 20.5979 15.2462 20.6067C15.464 20.6265 15.6478 20.4686 15.6675 20.2569C15.8444 18.3445 17.2811 16.7261 19.1595 16.3225V16.3218Z"
+ fill="white"
+ />
+ <path
+ d="M18.7254 13.8296C18.9344 13.7847 19.0678 13.5778 19.0229 13.3689C18.9834 13.1872 18.8228 13.0626 18.6445 13.0626C18.6172 13.0626 18.5907 13.066 18.5635 13.0715C16.9627 13.4152 15.5383 14.2455 14.4419 15.4732C13.3366 16.7105 12.6724 18.235 12.5193 19.8813C12.5097 19.9841 12.541 20.0848 12.607 20.1644C12.6724 20.2441 12.767 20.2938 12.8698 20.3026C13.0862 20.3223 13.2713 20.1644 13.291 19.9528C13.5667 16.9759 15.8017 14.4585 18.7254 13.8303V13.8296Z"
+ fill="white"
+ />
+ </svg>
+ }
+ {...restProps}
+ />
+ );
+};
+
+export default StakePushPurpleCoin;

src/blocks/illustrations/index.ts

@@ -85,6 +85,10 @@ export { default as StakePushOrangeCoin } from './components/StakePushOrangeCoin
 
 export { default as StakePushOrangeMultiplier } from './components/StakePushOrangeMultiplier';
 
+export { default as StakePushOrangeDoubleStarMultiplier } from './components/StakePushOrangeDoubleStarMultiplier';
+
+export { default as StakePushPurpleCoin } from './components/StakePushPurpleCoin';
+
 export { default as StakePushYellowCoin } from './components/StakePushYellowCoin';
 
 export { default as StakePushYellowMultiplier } from './components/StakePushYellowMultiplier';

src/modules/rewards/components/RewardsActivityIcon.tsx

@@ -20,7 +20,9 @@ import {
  StakePushGreyCoin,
  StakePushGreyMultiplier,
  StakePushOrangeCoin,
+ StakePushOrangeDoubleStarMultiplier,
  StakePushOrangeMultiplier,
+ StakePushPurpleCoin,
  StakePushYellowCoin,
  StakePushYellowMultiplier,
  SubscribePoints,
@@ -169,12 +171,7 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
  );
  }
 
- if (
- type === 'stake_10_uni_v2_lp_epoch' ||
- type === 'stake_10k_push_epoch' ||
- type === 'stake_5_uni_v2_lp_epoch' ||
- type === 'stake_5k_push_epoch'
- ) {
+ if (type === 'stake_5_uni_v2_lp_epoch' || type === 'stake_5k_push_epoch') {
  return (
  <StakePushOrangeCoin
  width={48}
@@ -183,6 +180,15 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
  );
  }
 
+ if (type === 'stake_10_uni_v2_lp_epoch' || type === 'stake_10k_push_epoch') {
+ return (
+ <StakePushPurpleCoin
+ width={48}
+ height={48}
+ />
+ );
+ }
+
  if (type === 'stake_50_uni_v2_lp_epoch' || type === 'stake_50k_push_epoch') {
  return (
  <StakePushBlueCoin
@@ -219,12 +225,7 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
  );
  }
 
- if (
- type === 'stake_10_uni_v2_lp_one_time' ||
- type === 'stake_10k_push_one_time' ||
- type === 'stake_5_uni_v2_lp_one_time' ||
- type === 'stake_5k_push_one_time'
- ) {
+ if (type === 'stake_5_uni_v2_lp_one_time' || type === 'stake_5k_push_one_time') {
  return (
  <StakePushOrangeMultiplier
  width={48}
@@ -233,6 +234,15 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
  );
  }
 
+ if (type === 'stake_10_uni_v2_lp_one_time' || type === 'stake_10k_push_one_time') {
+ return (
+ <StakePushOrangeDoubleStarMultiplier
+ width={48}
+ height={48}
+ />
+ );
+ }
+
  if (type === 'stake_50_uni_v2_lp_one_time' || type === 'stake_50k_push_one_time') {
  return (
  <StakePushBlueMultiplier

src/modules/rewards/utils/stakeRewardUtilities.ts

@@ -50,11 +50,7 @@ export const getActivityData = (
 // and also, doing a filter and sort of all the unis, and all push to get the latest activities in the useStakeRewardsResetTime hook
 export const filterAndSortActivities = (prefix: string, activities: any[], multiplier?: boolean) => {
  return activities
- .filter(
- (activity) =>
- activity.index.startsWith(multiplier ? `multiplier-${prefix}` : `point-${prefix}`) &&
- activity?.status === 'ENABLED'
- )
+ .filter((activity) => activity.index.startsWith(multiplier ? `multiplier-${prefix}` : `point-${prefix}`))
  .sort(sortByIndexNumber);
 };