fix conflicts

src/modules/rewards/components/RewardsTabsContainer.tsx

@@ -1,22 +1,25 @@
 import { FC } from 'react';
 
-// types
-import { RewardsTabs as RewardsTabsType } from '../Rewards.types';
-
 //Components
 import { Box, TabItem, Tabs } from 'blocks';
 import { DashboardSection } from './DashboardSection';
 import { LeaderBoardSection } from './LeaderBoardSection';
-import { RewardsActivitiesSection } from './RewardsActivitiesSection';
 import { RewardsTabs } from '../Rewards.types';
+import { ReferralSection } from './ReferralSection';
+import { RewardsActivitiesBottomSection } from './RewardsActivitiesBottomSection';
+import { DailyRewardsSection } from './DailyRewardsSection';
 
 export type RewardsTabsContainerProps = {
  activeTab: RewardsTabs;
  handleSetActiveTab: (tab: RewardsTabs) => void;
  handleUnlockProfile: () => void;
 };
 
-const RewardsTabsContainer: FC<RewardsTabsContainerProps> = ({ activeTab, handleSetActiveTab,handleUnlockProfile, }) => {
+const RewardsTabsContainer: FC<RewardsTabsContainerProps> = ({
+ activeTab,
+ handleSetActiveTab,
+ handleUnlockProfile,
+}) => {
  const rewardsTabs: TabItem[] = [
  {
  key: 'dashboard',
@@ -26,7 +29,7 @@ const RewardsTabsContainer: FC<RewardsTabsContainerProps> = ({ activeTab, handle
  {
  key: 'activity',
  label: 'Reward Activities',
- children: <RewardsActivitiesSection />,
+ children: <DailyRewardsSection />,
  },
  {
  key: 'leaderboard',
@@ -44,12 +47,6 @@ const RewardsTabsContainer: FC<RewardsTabsContainerProps> = ({ activeTab, handle
  flexDirection="column"
  padding={{ ml: 'spacing-sm', initial: 'spacing-md' }}
  >
- <Box
- gap="spacing-md"
- display="flex"
- flexDirection="column"
- >
-
  <Tabs
  items={rewardsTabs}
  activeKey={activeTab}

src/queries/queryKeys.ts

@@ -20,24 +20,20 @@ export const creatingNewChannel = 'creatingNewChannel';
 export const approvingPUSHToken = 'approvingPUSHToken';
 export const initiateNewChain = 'initiateNewChain';
 export const pointsVaultApprovedUsers = 'pointsVaultApprovedUsers';
-export const pointsVaultPendingUsers = 'pointsVaultPendingUsers';
 export const pointsVaultRejectedUsers = 'pointsVaultRejectedUsers';
 export const pushStakeEpoch = 'pushStakeEpoch';
 export const uniV2StakeEpoch = 'uniV2StakeEpoch';
 export const userTwitterDetails = 'userTwitterDetails';
 export const pointsVaultSearch = 'pointsVaultSearch';
-export const pointsVaultUserLoginKey = 'pointsVaultUserLogin';
 export const reactivatingChannel = 'reactivatingChannel';
 export const rejectVaultUser = 'rejectVaultUser';
 export const removeDelegate = 'removeDelegate';
 export const rewardsActivity = 'rewardsActivity';
-export const rewardsLeaderboard = 'rewardsLeaderboard';
 export const sendNotification = 'sendNotification';
 export const trendingChannels = 'trendingChannels';
 export const updateChannelDetails = 'updateChannelDetails';
 export const userRewardsDetails = 'userRewardsDetails';
 export const userSubscription = 'userSubscription';
-export const userTwitterDetails = 'userTwitterDetails';
 export const verifyAliasChain = 'verifyAliasChain';
 export const sentMessageCount = 'sentMessageCount';
 export const sentNotificationCount = 'sentNotificationCount';