diff --git a/package.json b/package.json
index c206c8ba5c..ec08fc8902 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,9 @@
     "@metamask/eth-sig-util": "^4.0.0",
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.5.0",
-    "@pushprotocol/restapi": "1.7.25",
+    "@pushprotocol/restapi": "1.7.29",
     "@pushprotocol/socket": "0.5.3",
-    "@pushprotocol/uiweb": "1.7.1",
+    "@pushprotocol/uiweb": "1.7.2",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-switch": "^1.1.0",
diff --git a/src/blocks/icons/components/Asterisk.tsx b/src/blocks/icons/components/Asterisk.tsx
index 6313a21f20..05ca467a07 100644
--- a/src/blocks/icons/components/Asterisk.tsx
+++ b/src/blocks/icons/components/Asterisk.tsx
@@ -9,16 +9,33 @@ const Asterisk: FC<IconProps> = (allProps) => {
       componentName="Asterisk"
       icon={
         <svg
+          xmlns="http://www.w3.org/2000/svg"
           width="inherit"
           height="inherit"
-          viewBox="0 0 5 5"
-          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 32 32"
           fill="none"
           {...props}
         >
           <path
-            d="M0.687978 4.28802L0.795978 4.14402L1.43198 3.32202L1.83998 2.84202C1.82798 2.81802 1.82198 2.79402 1.81598 2.76402L1.20998 2.62002L0.207978 2.33802L0.039978 2.28402L0.327978 1.40202L0.495978 1.45602L1.47398 1.81002L2.04398 2.04402C2.06798 2.02602 2.09198 2.00802 2.11598 1.99002L2.07398 1.39002L2.03798 0.346015V0.166016H2.96198V0.346015L2.92598 1.39002L2.87798 1.99002C2.90198 2.00802 2.92598 2.02602 2.94998 2.04402L3.51998 1.81002L4.50398 1.45602L4.67198 1.40202L4.95998 2.28402L4.78598 2.33802L3.78398 2.62002L3.17798 2.76402C3.17198 2.79402 3.16598 2.81802 3.15398 2.84202L3.56198 3.32202L4.20398 4.14402L4.30598 4.28802L3.55598 4.83402L3.45398 4.68402L2.87198 3.82002L2.54798 3.29202C2.52998 3.29202 2.51198 3.29202 2.49998 3.29202C2.48198 3.29202 2.46398 3.29202 2.44598 3.29202L2.12198 3.82002L1.53998 4.68402L1.43798 4.83402L0.687978 4.28802Z"
-            fill="currentColor"
+            d="M16 5V27"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <path
+            d="M6 10L26 22"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <path
+            d="M6 22L26 10"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
           />
         </svg>
       }
diff --git a/src/blocks/icons/components/FillCircle.tsx b/src/blocks/icons/components/FillCircle.tsx
new file mode 100644
index 0000000000..271e50b978
--- /dev/null
+++ b/src/blocks/icons/components/FillCircle.tsx
@@ -0,0 +1,32 @@
+import { FC } from 'react';
+import { IconWrapper } from '../IconWrapper';
+import { IconProps } from '../Icons.types';
+
+const FillCircle: FC<IconProps> = (allProps) => {
+  const { svgProps: props, ...restProps } = allProps;
+  return (
+    <IconWrapper
+      componentName="FillCircle"
+      icon={
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="inherit"
+          height="inherit"
+          viewBox="0 0 20 20"
+          fill="none"
+          {...props}
+        >
+          <circle
+            cx="10"
+            cy="10"
+            r="10"
+            fill="currentColor"
+          />
+        </svg>
+      }
+      {...restProps}
+    />
+  );
+};
+
+export default FillCircle;
diff --git a/src/blocks/icons/components/Image.tsx b/src/blocks/icons/components/Image.tsx
new file mode 100644
index 0000000000..b89b65265f
--- /dev/null
+++ b/src/blocks/icons/components/Image.tsx
@@ -0,0 +1,55 @@
+import { FC } from 'react';
+import { IconWrapper } from '../IconWrapper';
+import { IconProps } from '../Icons.types';
+
+const Image: FC<IconProps> = (allProps) => {
+  const { svgProps: props, ...restProps } = allProps;
+  return (
+    <IconWrapper
+      componentName="Image"
+      icon={
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="inherit"
+          height="inherit"
+          viewBox="0 0 24 22"
+          fill="none"
+          {...props}
+        >
+          <path
+            d="M15.2109 9.20528C15.97 9.20528 16.5854 8.58987 16.5854 7.83073C16.5854 7.07158 15.97 6.45618 15.2109 6.45618C14.4517 6.45618 13.8363 7.07158 13.8363 7.83073C13.8363 8.58987 14.4517 9.20528 15.2109 9.20528Z"
+            fill="currentColor"
+          />
+          <path
+            d="M14.2155 15.1617L17.1581 12.2224C17.33 12.0507 17.563 11.9542 17.8059 11.9542C18.0488 11.9542 18.2818 12.0507 18.4537 12.2224L23 16.7722"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <path
+            d="M1.0072 15.6989L7.23163 9.47329C7.31674 9.38809 7.41781 9.3205 7.52905 9.27438C7.6403 9.22827 7.75954 9.20453 7.87997 9.20453C8.00039 9.20453 8.11963 9.22827 8.23088 9.27438C8.34213 9.3205 8.44319 9.38809 8.5283 9.47329L19.2555 20.2017"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <rect
+            x="1"
+            y="1.79828"
+            width="22"
+            height="18.4034"
+            rx="4"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+        </svg>
+      }
+      {...restProps}
+    />
+  );
+};
+
+export default Image;
diff --git a/src/blocks/icons/components/Lock.tsx b/src/blocks/icons/components/Lock.tsx
index 9b95956f11..1937767e9a 100644
--- a/src/blocks/icons/components/Lock.tsx
+++ b/src/blocks/icons/components/Lock.tsx
@@ -12,23 +12,38 @@ const Lock: FC<IconProps> = (allProps) => {
           xmlns="http://www.w3.org/2000/svg"
           width="inherit"
           height="inherit"
-          viewBox="0 0 29 28"
+          viewBox="0 0 32 32"
           fill="none"
           {...props}
         >
-          <g clip-path="url(#clip0_5205_40502)">
+          <g clip-path="url(#clip0_9875_5020)">
             <path
-              d="M21.8657 8.75H19.3657V6.125C19.3657 4.73261 18.8126 3.39726 17.828 2.41269C16.8435 1.42812 15.5081 0.875 14.1157 0.875C12.7233 0.875 11.388 1.42812 10.4034 2.41269C9.41885 3.39726 8.86572 4.73261 8.86572 6.125V8.75H6.36572C5.90159 8.75 5.45647 8.93437 5.12829 9.26256C4.8001 9.59075 4.61572 10.0359 4.61572 10.5V22.75C4.61572 23.2141 4.8001 23.6592 5.12829 23.9874C5.45647 24.3156 5.90159 24.5 6.36572 24.5H21.8657C22.3299 24.5 22.775 24.3156 23.1032 23.9874C23.4313 23.6592 23.6157 23.2141 23.6157 22.75V10.5C23.6157 10.0359 23.4313 9.59075 23.1032 9.26256C22.775 8.93437 22.3299 8.75 21.8657 8.75ZM14.1157 17.9375C13.8561 17.9375 13.6024 17.8605 13.3865 17.7163C13.1707 17.5721 13.0025 17.3671 12.9031 17.1273C12.8038 16.8874 12.7778 16.6235 12.8284 16.3689C12.8791 16.1143 13.0041 15.8805 13.1876 15.6969C13.3712 15.5134 13.6051 15.3884 13.8597 15.3377C14.1143 15.2871 14.3782 15.3131 14.618 15.4124C14.8578 15.5117 15.0628 15.68 15.207 15.8958C15.3512 16.1117 15.4282 16.3654 15.4282 16.625C15.4282 16.9731 15.2899 17.3069 15.0438 17.5531C14.7977 17.7992 14.4638 17.9375 14.1157 17.9375ZM17.6157 8.75H10.6157V6.125C10.6157 5.19674 10.9845 4.3065 11.6408 3.65013C12.2972 2.99375 13.1875 2.625 14.1157 2.625C15.044 2.625 15.9342 2.99375 16.5906 3.65013C17.247 4.3065 17.6157 5.19674 17.6157 6.125V8.75Z"
+              d="M16 21.5638C16.8284 21.5638 17.5 20.8922 17.5 20.0638C17.5 19.2354 16.8284 18.5638 16 18.5638C15.1716 18.5638 14.5 19.2354 14.5 20.0638C14.5 20.8922 15.1716 21.5638 16 21.5638Z"
               fill="currentColor"
             />
+            <path
+              d="M11 12.9362V8.93622C11 7.61014 11.5268 6.33837 12.4645 5.40068C13.4021 4.463 14.6739 3.93622 16 3.93622C17.3261 3.93622 18.5979 4.463 19.5355 5.40068C20.4732 6.33837 21 7.61014 21 8.93622V12.9362"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+            <rect
+              x="5"
+              y="13"
+              width="22"
+              height="15"
+              rx="3"
+              stroke="currentColor"
+              stroke-width="2"
+            />
           </g>
           <defs>
-            <clipPath id="clip0_5205_40502">
+            <clipPath id="clip0_9875_5020">
               <rect
-                width="28"
-                height="28"
+                width="32"
+                height="32"
                 fill="white"
-                transform="translate(0.115723)"
               />
             </clipPath>
           </defs>
diff --git a/src/blocks/icons/components/Logout.tsx b/src/blocks/icons/components/Logout.tsx
index b6d129e4b2..d923a5bdd2 100644
--- a/src/blocks/icons/components/Logout.tsx
+++ b/src/blocks/icons/components/Logout.tsx
@@ -12,24 +12,24 @@ const Logout: FC<IconProps> = (allProps) => {
           xmlns="http://www.w3.org/2000/svg"
           width="inherit"
           height="inherit"
-          viewBox="0 0 24 24"
+          viewBox="0 0 32 32"
           fill="none"
           {...props}
         >
           <path
-            d="M10.0962 1H3.63464C2.53008 1 1.63464 1.89543 1.63464 3V21C1.63464 22.1046 2.53007 23 3.63464 23H10.0962"
+            d="M14.0962 5H7.63464C6.53008 5 5.63464 5.89543 5.63464 7V25C5.63464 26.1046 6.53007 27 7.63464 27H14.0962"
             stroke="currentColor"
             stroke-width="2"
             stroke-linecap="round"
           />
           <path
-            d="M8.8269 11.5769H22.3654"
+            d="M12.8269 15.5769H26.3654"
             stroke="currentColor"
             stroke-width="2"
             stroke-linecap="round"
           />
           <path
-            d="M17.7115 6.0769L22.3654 11.5769L17.7115 17.5"
+            d="M21.7115 10.0769L26.3654 15.5769L21.7115 21.5"
             stroke="currentColor"
             stroke-width="2"
             stroke-linecap="round"
diff --git a/src/blocks/icons/index.ts b/src/blocks/icons/index.ts
index 089304d5b5..9b49da2f6b 100644
--- a/src/blocks/icons/index.ts
+++ b/src/blocks/icons/index.ts
@@ -70,10 +70,12 @@ export { default as ErrorFilled } from './components/ErrorFilled';
 export { default as ExternalLink } from './components/ExternalLink';
 
 export { default as Front } from './components/Front';
+export { default as FillCircle } from './components/FillCircle';
 
 export { default as Gif } from './components/Gif';
 
 export { default as InfoFilled } from './components/InfoFilled';
+export { default as Image } from './components/Image';
 
 export { default as Governance } from './components/Governance';
 export { default as GovernanceFilled } from './components/GovernanceFilled';
diff --git a/src/blocks/notification/Notification.tsx b/src/blocks/notification/Notification.tsx
index 9750a8f66a..8fefbe50af 100644
--- a/src/blocks/notification/Notification.tsx
+++ b/src/blocks/notification/Notification.tsx
@@ -116,12 +116,14 @@ const toastIds: Array<string | number> = [];
 
 // Export the notification object with show and hide methods
 const notification = {
-  show: (config: NotificationProps) => {
+  show: (config: NotificationProps, id?: string) => {
     const toastId = toast.custom(() => <NotificationItem {...config} />, {
+      id: id,
       duration: config.duration || Infinity,
       position: config.position || 'bottom-right',
+      onAutoClose: config.onAutoClose,
     });
-    toastIds.push(toastId);
+    if (!toastIds.find((toastId) => toastId === id)) toastIds.push(toastId);
   },
   hide: () => {
     if (toastIds.length > 0) {
diff --git a/src/blocks/notification/Notification.types.ts b/src/blocks/notification/Notification.types.ts
index 924f78109a..313bd31f02 100644
--- a/src/blocks/notification/Notification.types.ts
+++ b/src/blocks/notification/Notification.types.ts
@@ -16,4 +16,6 @@ export type NotificationProps = {
   position?: 'bottom-right' | 'bottom-left' | 'top-center';
   /* Optional duration of the notification component */
   duration?: number;
+  /* Optional onAutoClose event for the notification called after it's timeout */
+  onAutoClose?: () => void;
 };
diff --git a/src/blocks/text/Text.constants.ts b/src/blocks/text/Text.constants.ts
index 9eaa1275f2..0fd673960e 100644
--- a/src/blocks/text/Text.constants.ts
+++ b/src/blocks/text/Text.constants.ts
@@ -352,11 +352,19 @@ export const textVariants = {
     letterSpacing: null,
     textTransform: 'uppercase',
   },
+  'c-regular': {
+    fontSize: '12px',
+    fontStyle: null,
+    fontWeight: '400',
+    lineHeight: '16px',
+    letterSpacing: null,
+    textTransform: null,
+  },
   'c-semibold': {
-    fontSize: '10px',
+    fontSize: '12px',
     fontStyle: null,
     fontWeight: 500,
-    lineHeight: '14px',
+    lineHeight: '16px',
     letterSpacing: null,
     textTransform: null,
   },
@@ -368,11 +376,27 @@ export const textVariants = {
     letterSpacing: null,
     textTransform: null,
   },
-  'c-regular': {
-    fontSize: '12px',
+  'cs-regular': {
+    fontSize: '10px',
     fontStyle: null,
     fontWeight: '400',
-    lineHeight: '16px',
+    lineHeight: '14px',
+    letterSpacing: null,
+    textTransform: null,
+  },
+  'cs-semibold': {
+    fontSize: '10px',
+    fontStyle: null,
+    fontWeight: 500,
+    lineHeight: '14px',
+    letterSpacing: null,
+    textTransform: null,
+  },
+  'cs-bold': {
+    fontSize: '12px',
+    fontStyle: null,
+    fontWeight: '700',
+    lineHeight: '14px',
     letterSpacing: null,
     textTransform: null,
   },
diff --git a/src/common/Common.baseLogos.ts b/src/common/Common.baseLogos.ts
index 4c13172e6f..8b28675a07 100644
--- a/src/common/Common.baseLogos.ts
+++ b/src/common/Common.baseLogos.ts
@@ -18,3 +18,6 @@ export const pwnLogo =
 
 export const udLogo =
   'data:image/png;base64,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';
+
+export const btcTrackerLogo =
+  'data:image/png;base64,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';
diff --git a/src/common/Common.utils.tsx b/src/common/Common.utils.tsx
index ea6c7b8c83..7b33acc08f 100644
--- a/src/common/Common.utils.tsx
+++ b/src/common/Common.utils.tsx
@@ -2,6 +2,7 @@ import { appConfig } from 'config';
 import { LOGO_ALIAS_CHAIN } from './Common.constants';
 import { networkName } from 'helpers/UtilityHelper';
 import { EnvType } from './Common.types';
+import moment from 'moment';
 
 export const allowedNetworks = appConfig.allowedNetworks.filter(
   (chain: number) => chain != appConfig.coreContractChain
@@ -53,3 +54,19 @@ export const isValidURL = (str: string | undefined) => {
 export const getCurrentEnv = (): EnvType => {
   return appConfig.appEnv;
 };
+
+export function convertTimeStamp(timestamp: string) {
+  const date = moment.unix(Number(timestamp));
+  const now = moment();
+
+  const diffInSeconds = now.diff(date, 'seconds');
+  const diffInMinutes = now.diff(date, 'minutes');
+
+  if (diffInSeconds < 60) {
+    return 'now';
+  } else if (diffInMinutes < 60) {
+    return `${diffInMinutes} minutes ago`;
+  } else {
+    return date.format('hh:mm A');
+  }
+}
diff --git a/src/common/components/InAppChatNotifications.tsx b/src/common/components/InAppChatNotifications.tsx
new file mode 100644
index 0000000000..e4e33aa84d
--- /dev/null
+++ b/src/common/components/InAppChatNotifications.tsx
@@ -0,0 +1,222 @@
+import { FC, useContext } from 'react';
+
+import { useNavigate } from 'react-router-dom';
+import { css } from 'styled-components';
+
+import { Box, Cross, Pin, Text, Image, FillCircle, ChatFilled, EditProfile } from 'blocks';
+
+import { AppContextType } from 'types/context';
+import { AppContext } from 'contexts/AppContext';
+
+import { convertTimeStamp } from 'common/Common.utils';
+import { shortenText } from 'helpers/UtilityHelper';
+import { caip10ToWallet } from 'helpers/w2w';
+
+import { useResolveWeb3Name } from 'hooks/useResolveWeb3Name';
+import { useGetGroupInfo, useGetUserProfileDetails } from 'queries';
+
+type InAppChatNotificationsProps = {
+  chatDetails: Array<any>;
+  onClose: () => void;
+};
+
+const getContentText = (chatDetail: any) => {
+  if (chatDetail.message.type === 'Text') return chatDetail.message.content;
+  if (chatDetail.message.type === 'Image') return 'Image';
+  if (chatDetail.message.type === 'File') return 'File';
+  if (chatDetail.message.type === 'MediaEmbed' || chatDetail.message.type === 'GIF') return 'GIF';
+};
+const getContentImage = (chatDetail: any) => {
+  if (
+    chatDetail.message.type === 'Image' ||
+    chatDetail.message.type === 'MediaEmbed' ||
+    chatDetail.message.type === 'GIF'
+  )
+    return (
+      <Image
+        size={16}
+        color="icon-tertiary"
+      />
+    );
+  if (chatDetail.message.type === 'File')
+    return (
+      <Pin
+        size={16}
+        color="icon-tertiary"
+      />
+    );
+};
+
+const InAppChatNotifications: FC<InAppChatNotificationsProps> = ({ chatDetails, onClose }) => {
+  const { web3NameList }: AppContextType = useContext(AppContext)!;
+  const fromAddress = caip10ToWallet(chatDetails[0]?.from);
+  const { data: userProfileDetails } = useGetUserProfileDetails(fromAddress, {
+    refetchOnWindowFocus: false,
+    staleTime: Infinity,
+    refetchInterval: 3600000, // 1 hour,
+  });
+  const { data: groupInfo } = useGetGroupInfo(chatDetails[0]?.meta?.group ? chatDetails[0].chatId : '', {
+    refetchOnWindowFocus: false,
+    staleTime: Infinity,
+    refetchInterval: 3600000, // 1 hour,
+  });
+
+  const navigate = useNavigate();
+
+  useResolveWeb3Name(fromAddress);
+  const web3Name = web3NameList[fromAddress];
+  const sender = web3Name ? web3Name : shortenText(fromAddress, 6);
+  const displayName = chatDetails[0]?.meta?.group
+    ? groupInfo?.groupName || shortenText(chatDetails[0]?.chatId, 6)
+    : web3Name || shortenText(fromAddress, 6);
+
+  const latestTimestamp = convertTimeStamp(chatDetails[chatDetails.length - 1]?.timestamp);
+
+  //optimise it and fix the close button z-index
+  return (
+    <Box
+      width="397px"
+      display="flex"
+    >
+      {chatDetails && userProfileDetails && (
+        <Box
+          padding="spacing-sm"
+          display="flex"
+          borderRadius="radius-sm"
+          flexDirection="column"
+          gap="spacing-xxs"
+          border="border-sm solid stroke-tertiary"
+          backgroundColor="surface-primary"
+          width="inherit"
+          cursor="pointer"
+          onClick={() => navigate(`/chat/chatid:${chatDetails[0].chatId}`)}
+        >
+          <Box
+            display="flex"
+            justifyContent="space-between"
+            alignItems="center"
+          >
+            <Box
+              display="flex"
+              gap="spacing-xxs"
+              alignItems="center"
+            >
+              <Box
+                width="24px"
+                height="24px"
+                overflow="hidden"
+                borderRadius="radius-round"
+                css={css`
+                  flex-shrink: 0;
+                `}
+              >
+                {chatDetails[0].event === 'chat.request' ? (
+                  <ChatFilled
+                    size={24}
+                    color="icon-brand-medium"
+                  />
+                ) : (
+                  <img
+                    width="100%"
+                    height="100%"
+                    src={userProfileDetails?.picture || groupInfo?.groupImage || ''}
+                    alt={displayName}
+                  />
+                )}
+              </Box>
+              <Text
+                color="text-primary"
+                variant="bes-semibold"
+              >
+                {chatDetails[0].event === 'chat.request' ? 'Push Chat' : displayName}
+              </Text>
+              <FillCircle
+                color="icon-tertiary"
+                size={4}
+              />
+              <Text
+                color="text-tertiary"
+                variant="c-semibold"
+              >
+                {latestTimestamp}
+              </Text>
+            </Box>
+            <Box
+              onClick={(e) => {
+                e.stopPropagation();
+                onClose();
+              }}
+              cursor="pointer"
+            >
+              <Cross
+                color="icon-primary"
+                size={16}
+              />
+            </Box>
+          </Box>
+          {chatDetails.map((chatDetail: any) =>
+            chatDetail.event === 'chat.request' ? (
+              <Box
+                display="flex"
+                gap="spacing-xxxs"
+                alignItems="center"
+              >
+                <EditProfile
+                  size={16}
+                  color="icon-tertiary"
+                />
+                <Box>
+                  <Text
+                    color="text-primary"
+                    variant="bes-bold"
+                    as="span"
+                  >
+                    {displayName}{' '}
+                  </Text>
+                  <Text
+                    color="text-secondary"
+                    variant="bes-regular"
+                    as="span"
+                  >
+                    has sent you a chat request
+                  </Text>
+                </Box>
+              </Box>
+            ) : (
+              <Box
+                display="flex"
+                flexDirection="column"
+              >
+                <Box
+                  display="flex"
+                  gap="spacing-xxxs"
+                  alignItems="center"
+                >
+                  {chatDetails[0]?.meta?.group && (
+                    <Text
+                      color="text-primary"
+                      variant="bes-bold"
+                      as="span"
+                    >
+                      {sender}{' '}
+                    </Text>
+                  )}
+                  {chatDetail.message.type !== 'Text' ? <Box>{getContentImage(chatDetail)}</Box> : null}
+                  <Text
+                    color="text-secondary"
+                    variant="bes-regular"
+                    numberOfLines={2}
+                  >
+                    {getContentText(chatDetail)}
+                  </Text>
+                </Box>
+              </Box>
+            )
+          )}
+        </Box>
+      )}
+    </Box>
+  );
+};
+
+export { InAppChatNotifications };
diff --git a/src/common/components/index.ts b/src/common/components/index.ts
index 465df82dad..4b5412cac5 100644
--- a/src/common/components/index.ts
+++ b/src/common/components/index.ts
@@ -9,3 +9,4 @@ export * from './TokenFaucet';
 export * from './CopyButton';
 export * from './VerifiedChannelTooltipContent';
 export * from './InAppChannelNotifications';
+export * from './InAppChatNotifications';
diff --git a/src/common/hooks/useInAppNotifications.tsx b/src/common/hooks/useInAppNotifications.tsx
index 592b596648..2f58a684ab 100644
--- a/src/common/hooks/useInAppNotifications.tsx
+++ b/src/common/hooks/useInAppNotifications.tsx
@@ -1,15 +1,16 @@
 import { useEffect, useState } from 'react';
 
-import { CONSTANTS, NotificationEvent } from '@pushprotocol/restapi';
 import { useSelector } from 'react-redux';
+import { CONSTANTS, NotificationEvent } from '@pushprotocol/restapi';
 
 import { deviceSizes, notification } from 'blocks';
-import { InAppChannelNotifications } from 'common';
+import { InAppChannelNotifications, InAppChatNotifications } from 'common';
 
 import { useDeviceWidthCheck } from 'hooks';
 
 export const useInAppNotifications = () => {
   const [isStreamConnected, setIsStreamConnected] = useState<boolean>(false);
+  const [newMessages, setNewMessages] = useState<Record<string, Array<any>>>({});
   const isMobile = useDeviceWidthCheck(parseInt(deviceSizes.mobileL));
   const { userPushSDKInstance } = useSelector((state: any) => {
     return state.user;
@@ -42,27 +43,87 @@ export const useInAppNotifications = () => {
         userPushSDKInstance?.stream?.uid,
         userPushSDKInstance?.stream
       );
-      notification.show({
-        overlay: <InAppChannelNotifications notificationDetails={data} />,
-        position: isMobile ? 'top-center' : 'bottom-right',
-        duration: 5000,
-        onClick: () => {
-          notification.hide();
-        },
-      });
+      if (data.source != 'PUSH_CHAT')
+        notification.show({
+          overlay: <InAppChannelNotifications notificationDetails={data} />,
+          position: isMobile ? 'top-center' : 'bottom-right',
+          duration: 5000,
+          onClick: () => {
+            notification.hide();
+          },
+        });
     });
-  };
+    userPushSDKInstance?.stream?.on(CONSTANTS.STREAM.CHAT, (data: any) => {
+      console.debug(
+        'src::common::hooks::useStream::attachListeners::CHAT::',
+        userPushSDKInstance?.uid,
+        userPushSDKInstance?.stream.connected(),
+        userPushSDKInstance?.stream?.uid,
+        userPushSDKInstance?.stream
+      );
 
-  useEffect(() => {
-    (async () => {
-      if (userPushSDKInstance && userPushSDKInstance?.stream) {
-        await attachListeners();
+      if ((data.event === 'chat.message' || data.event === 'chat.request') && data.origin === 'other') {
+        let updatedMessages: Record<string, Array<any>> = newMessages;
+        if (!updatedMessages[data.chatId]) {
+          updatedMessages[data.chatId] = [];
+        }
+        // Ensure the chat array length does not exceed 5 messages
+        if (updatedMessages[data.chatId].length > 5) {
+          updatedMessages[data.chatId] = updatedMessages[data.chatId].slice(-5);
+        }
+        if (!(updatedMessages[data.chatId].length && data.event === 'chat.request')) {
+          updatedMessages[data.chatId].push(data);
+        }
+        setNewMessages(updatedMessages);
+        notification.show(
+          {
+            overlay: (
+              <InAppChatNotifications
+                chatDetails={updatedMessages[data.chatId]}
+                onClose={() => {
+                  resetChatMessages(data.chatId);
+                  notification.hide();
+                }}
+              />
+            ),
+            position: isMobile ? 'top-center' : 'bottom-right',
+            duration: 5000,
+            onAutoClose: () => resetChatMessages(data.chatId),
+            onClick: () => {
+              resetChatMessages(data.chatId);
+              notification.hide();
+            },
+          },
+          data.chatId
+        );
       }
-    })();
+    });
+  };
+
+  /* remove previous messages for a particular chat*/
+  const resetChatMessages = (chatId: string) => {
+    const updatedMessages = newMessages;
+    delete updatedMessages[chatId];
+    setNewMessages(updatedMessages);
+  };
 
-    // Cleanup listener on unmount
-    return () => {};
-  }, [userPushSDKInstance?.account]);
+  const streamAttach = () => {
+    if (userPushSDKInstance && userPushSDKInstance?.stream) {
+      attachListeners();
+    }
+  };
+  const streamCleanup = () => {
+    if (userPushSDKInstance && userPushSDKInstance?.stream) {
+      userPushSDKInstance?.stream?.disconnect();
+    }
+  };
+
+  useEffect(() => {
+    streamAttach();
+    return () => {
+      streamCleanup();
+    };
+  }, [userPushSDKInstance?.account, userPushSDKInstance?.readmode()]);
 
   return { isStreamConnected };
 };
diff --git a/src/components/PushSnap/PushSnapSettings.tsx b/src/components/PushSnap/PushSnapSettings.tsx
index e509132ac4..cda4ba6b07 100644
--- a/src/components/PushSnap/PushSnapSettings.tsx
+++ b/src/components/PushSnap/PushSnapSettings.tsx
@@ -10,14 +10,15 @@ import useModalBlur, { MODAL_POSITION } from 'hooks/useModalBlur';
 import AboutSnapModal from 'modules/snap/AboutSnapModal';
 import styled, { useTheme } from 'styled-components';
 import PushSnapConfigureModal from './PushSnapConfigureModal';
-import { Alert, Box, Button, Text } from 'blocks';
+import { Alert, Box, Button, Metamask, Text } from 'blocks';
 import { SnoozeDurationType } from 'types';
 
 const PushSnapSettings = () => {
-  const { account, isWalletConnected, connect } = useAccount();
+  const { account, isWalletConnected, connect, provider } = useAccount();
 
   const theme = useTheme();
   const [loading, setLoading] = useState(false);
+  const [walletConnected, setWalletConnected] = useState(false);
   const [addedAddress, setAddedAddress] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
 
@@ -31,11 +32,11 @@ const PushSnapSettings = () => {
 
   async function getInstalledSnaps() {
     if (!isWalletConnected) {
-      setErrorMessage("Connect your metamask wallet to install Snap");
+      setErrorMessage('Connect your metamask wallet to install Snap');
       setSnapInstalled(false);
-      return
+      return;
     }
-    setErrorMessage('')
+    setErrorMessage('');
     const installedSnaps = await window.ethereum.request({
       method: 'wallet_getSnaps',
     });
@@ -46,6 +47,39 @@ const PushSnapSettings = () => {
       }
     });
   }
+
+  async function getSignature(account: string) {
+    const signer = provider.getSigner(account);
+    const signature = await signer.signMessage(`Add address ${account} to receive notifications through Push Snap`);
+    return signature;
+  }
+
+  async function addwalletAddress() {
+    try {
+      const signatureResult = await getSignature(account);
+      if (signatureResult) {
+        if (account) {
+          await window.ethereum?.request({
+            method: 'wallet_invokeSnap',
+            params: {
+              snapId: defaultSnapOrigin,
+              request: {
+                method: 'pushproto_addaddress',
+                params: { address: account },
+              },
+            },
+          });
+          console.debug('Added', account);
+          setWalletConnected(true);
+        }
+      } else {
+        console.error('Signature Validation Failed');
+      }
+    } catch (error: any) {
+      setErrorMessage(error.message);
+    }
+  }
+
   async function getWalletAddresses() {
     const result = await window.ethereum?.request({
       method: 'wallet_invokeSnap',
@@ -55,10 +89,10 @@ const PushSnapSettings = () => {
       },
     });
 
-
     console.debug(account);
     if (result.includes(account)) {
       setAddedAddress(true);
+      setWalletConnected(true);
     } else {
       setAddedAddress(false);
     }
@@ -88,12 +122,15 @@ const PushSnapSettings = () => {
       setErrorMessage('Connect your metamask wallet to install Snap');
       return;
     }
-    setErrorMessage('')
+    setErrorMessage('');
     setLoading(true);
     try {
       if (!isWalletConnected) await connect();
       if (!snapInstalled) {
         await connectSnap();
+        getInstalledSnaps();
+      } else {
+        await addwalletAddress();
       }
       setLoading(false);
     } catch (error) {
@@ -164,8 +201,13 @@ const PushSnapSettings = () => {
             />
           )}
 
-          <ItemVV2>
-            {loading ? (
+          <Box
+            gap="spacing-sm"
+            display="flex"
+            flexDirection="column"
+            width="-webkit-fill-available"
+          >
+            {/* {loading ? (
               <LoaderSpinner
                 type={LOADER_TYPE.SEAMLESS}
                 spinnerSize={44}
@@ -173,7 +215,48 @@ const PushSnapSettings = () => {
             ) : (
               <Button onClick={() => connectToMetaMask()}>{!snapInstalled && 'Connect Snap'}</Button>
             )}
-          </ItemVV2>
+            <Button
+              disabled={snapInstalled ? false : true}
+              onClick={() => connectToMetaMask()}
+              trailingIcon={<Metamask />}
+            >
+              Step 2: Sign In with Metamask
+            </Button> */}
+            {loading && !snapInstalled ? (
+              <LoaderSpinner
+                type={LOADER_TYPE.SEAMLESS}
+                spinnerSize={44}
+              />
+            ) : (
+              <Button
+                disabled={!snapInstalled ? false : true}
+                onClick={() => connectToMetaMask()}
+                variant="primary"
+                size="large"
+              >
+                {!snapInstalled ? 'Step 1: Install Snap' : 'Step 1: Completed'}
+              </Button>
+            )}
+            {loading && snapInstalled ? (
+              <LoaderSpinner
+                type={LOADER_TYPE.SEAMLESS}
+                spinnerSize={44}
+              />
+            ) : (
+              <Button
+                disabled={snapInstalled ? false : true}
+                onClick={() => connectToMetaMask()}
+                trailingIcon={
+                  <Metamask
+                    height={24}
+                    width={24}
+                  />
+                }
+              >
+                Step 2: Sign In with Metamask
+              </Button>
+            )}
+          </Box>
 
           <InfoDiv
             gap="7px"
@@ -198,22 +281,21 @@ const PushSnapSettings = () => {
 
   return (
     <>
-      {!snapInstalled ? (
+      {!walletConnected ? (
         <InstallSnap />
       ) : (
         <>
           <Box
-            display='flex'
-            flexDirection='column'
-            padding='spacing-none spacing-none spacing-none spacing-xxs'
+            display="flex"
+            flexDirection="column"
+            padding="spacing-none spacing-none spacing-none spacing-xxs"
           >
-            <Text variant='h4-semibold'>Push Snap Settings</Text>
+            <Text variant="h4-semibold">Push Snap Settings</Text>
             <PushSnapConfigureModal
               snoozeDuration={snoozeDuration}
               setSnoozeDuration={setSnoozeDuration}
             />
           </Box>
-
         </>
       )}
     </>
@@ -224,7 +306,7 @@ export default PushSnapSettings;
 
 const Container = styled(Section)`
   width: 438px;
-  height: 423px;
+  height: auto;
   border-radius: 32px;
   background: #fff;
   background: ${(props) => props.theme.default.bg};
diff --git a/src/contexts/AppContext.tsx b/src/contexts/AppContext.tsx
index 7ef381d0b3..1ecc055873 100644
--- a/src/contexts/AppContext.tsx
+++ b/src/contexts/AppContext.tsx
@@ -223,7 +223,7 @@ const AppContextProvider = ({ children }: { children: ReactNode }) => {
     // call initializePushSDK if decryptedPGPKeys is not null
     if (decryptedPGPKeys) {
       console.debug('src::contexts::AppContext::initializePushSdkReadMode::Called initializePushSDK()');
-      return initializePushSDK();
+      return initializePushSDK(wallet);
     }
 
     // else initialize push sdk in read mode
@@ -288,10 +288,10 @@ const AppContextProvider = ({ children }: { children: ReactNode }) => {
           progress: 100,
         });
       }
-      dispatch(setUserPushSDKInstance(userInstance));
 
       // connect stream as well
       await setupStream(userInstance);
+      dispatch(setUserPushSDKInstance(userInstance));
       return userInstance;
     } catch (error) {
       // Handle initialization error
@@ -307,12 +307,11 @@ const AppContextProvider = ({ children }: { children: ReactNode }) => {
         CONSTANTS.STREAM.CONNECT,
         CONSTANTS.STREAM.DISCONNECT,
         CONSTANTS.STREAM.CHAT,
-        CONSTANTS.STREAM.CHAT_OPS,
         CONSTANTS.STREAM.NOTIF,
         CONSTANTS.STREAM.VIDEO,
       ]);
 
-      if (userInstance.readmode()) await stream.connect();
+      await stream.connect();
       console.debug('src::contexts::AppContext::setupStream::User Intance Stream Connected', userInstance);
     }
   };
@@ -489,7 +488,7 @@ const AppContextProvider = ({ children }: { children: ReactNode }) => {
       }
     };
     initialize();
-  }, [account, provider]);
+  }, [account]);
 
   const createUserIfNecessary = async (): Promise<ConnectedUser> => {
     try {
diff --git a/src/modules/rewards/components/ActivityButton.tsx b/src/modules/rewards/components/ActivityButton.tsx
index 684fa37e3d..482b392b1f 100644
--- a/src/modules/rewards/components/ActivityButton.tsx
+++ b/src/modules/rewards/components/ActivityButton.tsx
@@ -2,7 +2,7 @@
 import { FC } from 'react';
 
 //Queries
-import { ActvityType, UsersActivity } from 'queries';
+import { ActvityType, useGetPushStakeEpoch, useGetUniV2StakeEpoch, UsersActivity } from 'queries';
 import { Button } from 'blocks';
 import { ActivityVerificationButton } from './ActivityVerificationButton';
 import { useRewardsContext } from 'contexts/RewardsContext';
@@ -31,14 +31,39 @@ const ActivityButton: FC<ActivityButtonProps> = ({
   usersSingleActivity,
   isLoadingActivity,
   label,
-  isStakeSection,
-  lifeTime,
 }) => {
   const { resetEpoch } = useRewardsContext();
+  const { data: pushStakeData } = useGetPushStakeEpoch();
+  const { data: uniV2StakeData } = useGetUniV2StakeEpoch();
+  const isPushEpochRelated =
+    typeof usersSingleActivity?.activityTypeId === 'string' &&
+    usersSingleActivity.activityTypeId.endsWith('push_epoch');
 
-  if (usersSingleActivity?.status === 'COMPLETED' && isStakeSection && resetEpoch && !lifeTime) {
+  const isUniV2EpochRelated =
+    typeof usersSingleActivity?.activityTypeId === 'string' && usersSingleActivity.activityTypeId.endsWith('v2_epoch');
+
+  const isEpochRelated =
+    usersSingleActivity?.data?.currentEpoch == pushStakeData?.currentEpoch ||
+    usersSingleActivity?.data?.currentEpoch == uniV2StakeData?.currentEpoch;
+
+  // claimed status for the same epoch
+  if (usersSingleActivity?.status === 'COMPLETED' && (isPushEpochRelated || isUniV2EpochRelated) && isEpochRelated) {
+    console.log('claimed in this epoch button');
+    return (
+      <Button
+        variant="tertiary"
+        size="small"
+        disabled
+      >
+        Claimed
+      </Button>
+    );
+  }
+
+  // default verify button for stake epoch section
+  if (usersSingleActivity?.status === 'COMPLETED' && resetEpoch && (isPushEpochRelated || isUniV2EpochRelated)) {
+    console.log('reset button');
     return (
-      // default verify button
       <ActivityVerificationButton
         activityType={activityType}
         userId={userId}
diff --git a/src/modules/rewards/components/BonusActivitiesSection.tsx b/src/modules/rewards/components/BonusActivitiesSection.tsx
index 2f078e50f7..4f769fe4bd 100644
--- a/src/modules/rewards/components/BonusActivitiesSection.tsx
+++ b/src/modules/rewards/components/BonusActivitiesSection.tsx
@@ -18,7 +18,7 @@ import { useRewardsContext } from 'contexts/RewardsContext';
 import { walletToCAIP10 } from 'helpers/w2w';
 
 // components
-import { Alert, Box, Text } from 'blocks';
+import { Alert, Box, Lozenge, Star, Text } from 'blocks';
 import { BonusActivitiesItem } from './BonusActivitiesItem';
 
 export type BonusActivitiesSectionProps = {};
@@ -69,12 +69,20 @@ const BonusActivities: FC<BonusActivitiesSectionProps> = () => {
       flexDirection="column"
       gap="spacing-sm"
     >
-      <Text
-        variant="h4-bold"
-        color="text-primary"
+      <Box
+        display="flex"
+        flexDirection="row"
+        gap="spacing-xs"
+        alignItems="center"
       >
-        Bonus Activities
-      </Text>
+        <Text
+          variant="h4-bold"
+          color="text-primary"
+        >
+          Bonus Activities
+        </Text>
+        <Lozenge icon={<Star />}>NEW</Lozenge>
+      </Box>
 
       {errorMessage && (
         <Box width="-webkit-fill-available">
diff --git a/src/modules/rewards/components/RewardsActivitiesBottomSection.tsx b/src/modules/rewards/components/RewardsActivitiesBottomSection.tsx
index 39b022b384..54b96a0aae 100644
--- a/src/modules/rewards/components/RewardsActivitiesBottomSection.tsx
+++ b/src/modules/rewards/components/RewardsActivitiesBottomSection.tsx
@@ -19,8 +19,6 @@ const RewardsActivitiesBottomSection: FC<RewardsActivitiesBottomSectionProps> =
     >
       <RewardsActivitiesSection />
 
-      <BonusActivities />
-
       <Box
         backgroundColor="surface-primary"
         borderRadius="radius-md"
@@ -41,7 +39,6 @@ const RewardsActivitiesBottomSection: FC<RewardsActivitiesBottomSectionProps> =
         display="flex"
         flexDirection="column"
         padding={{ ml: 'spacing-sm', initial: 'spacing-md' }}
-        margin="spacing-none spacing-none spacing-md spacing-none"
       >
         <StakePushSection
           lifeTime={true}
@@ -49,6 +46,8 @@ const RewardsActivitiesBottomSection: FC<RewardsActivitiesBottomSectionProps> =
           subtitle="Visit [app.push.org/yield](https://app.push.org/yield) and stake tokens in the Fee Pool or LP Pool to activate multipliers."
         />
       </Box>
+
+      <BonusActivities />
     </Box>
   );
 };
diff --git a/src/modules/rewards/components/RewardsActivityIcon.tsx b/src/modules/rewards/components/RewardsActivityIcon.tsx
index 9a48f24553..4ce3744cc5 100644
--- a/src/modules/rewards/components/RewardsActivityIcon.tsx
+++ b/src/modules/rewards/components/RewardsActivityIcon.tsx
@@ -1,5 +1,4 @@
 import { FC } from 'react';
-
 import {
   ActivePushPoints,
   BlueBonusActivitySubscribers,
@@ -39,6 +38,7 @@ import {
   revokeLogo,
   pwnLogo,
   udLogo,
+  btcTrackerLogo,
 } from 'common';
 import { ActvityType } from 'queries';
 
@@ -259,6 +259,17 @@ const RewardsActivityIcon: FC<RewardsActivityIconProp> = ({ type }) => {
     );
   }
 
+  if (type === 'channel_specific_subscriptions:BTC_PRICE_TRACKER_CHANNEL') {
+    return (
+      <img
+        width={48}
+        height={48}
+        src={btcTrackerLogo}
+        style={{ borderRadius: 'var(--radius-round)' }}
+      />
+    );
+  }
+
   if (type === 'atleast_5_defi_channel_specific_subscriptions') {
     return (
       <FiveSubscribedDefiChannel
diff --git a/src/modules/rewards/components/StakePushActivitiesListItem.tsx b/src/modules/rewards/components/StakePushActivitiesListItem.tsx
index 501bb0806d..d1e35dbe1f 100644
--- a/src/modules/rewards/components/StakePushActivitiesListItem.tsx
+++ b/src/modules/rewards/components/StakePushActivitiesListItem.tsx
@@ -6,7 +6,7 @@ import { Activity, StakeActivityResponse, UsersActivity } from 'queries';
 import { useAccount } from 'hooks';
 
 // components
-import { Box, Button, Lock, Multiplier, RewardsBell, Skeleton, Text } from 'blocks';
+import { Box, Button, Lock, Lozenge, Multiplier, RewardsBell, Skeleton, Star, Text } from 'blocks';
 import { RewardsActivityIcon } from './RewardsActivityIcon';
 import { ActivityButton } from './ActivityButton';
 
@@ -39,7 +39,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   const usersSingleActivity = allUsersActivity?.[activity?.activityType] as UsersActivity;
   const isLoading = isAllActivitiesLoading;
 
-  const hasActivityEndedUnclaimed = usersSingleActivity?.status !== 'COMPLETED' && hasEpochEnded;
+  const hasActivityEndedUnclaimed = hasEpochEnded;
 
   const isLockedOrNotConnected = isLocked || !isWalletConnected;
 
@@ -93,7 +93,11 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
             gap={{ ml: 'spacing-sm', initial: 'spacing-xxxs' }}
             alignItems={{ ml: 'center' }}
           >
-            <Box display={{ ml: 'block', initial: 'none' }}>
+            <Box
+              display={{ ml: 'flex', initial: 'none' }}
+              flexDirection="column"
+              alignItems="center"
+            >
               <Text
                 color="text-primary"
                 variant="h6-bold"
@@ -101,8 +105,19 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
               >
                 {activity?.activityTitle}
               </Text>
+              {activity?.tags?.map((tag) => (
+                <Lozenge
+                  size="small"
+                  icon={<Star />}
+                >
+                  {tag}
+                </Lozenge>
+              ))}
             </Box>
-            <Box display={{ ml: 'none', initial: 'block' }}>
+            <Box
+              display={{ ml: 'none', initial: 'flex' }}
+              gap="spacing-xs"
+            >
               <Text
                 color="text-primary"
                 variant="bl-semibold"
@@ -110,6 +125,14 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
               >
                 {activity?.activityTitle}
               </Text>
+              {activity?.tags?.map((tag) => (
+                <Lozenge
+                  size="small"
+                  icon={<Star />}
+                >
+                  {tag}
+                </Lozenge>
+              ))}
             </Box>
 
             {activity.points > 0 && (
diff --git a/src/modules/rewards/components/StakePushSection.tsx b/src/modules/rewards/components/StakePushSection.tsx
index 10cae3ed15..f3e6062b4e 100644
--- a/src/modules/rewards/components/StakePushSection.tsx
+++ b/src/modules/rewards/components/StakePushSection.tsx
@@ -25,7 +25,7 @@ export type StakePushPoints = {
 const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, lifeTime }) => {
   const { account, isWalletConnected } = useAccount();
   const { isLocked } = useRewardsContext();
-  const { stakePushArray, uniV2PushArray, isLoading, daysToReset } = useStakeRewardsResetTime({
+  const { stakePushArray, uniV2PushArray, isLoading, daysToReset, refetchSendActivities } = useStakeRewardsResetTime({
     lifeTime,
   });
   const [errorMessage, setErrorMessage] = useState<string>('');
@@ -184,7 +184,10 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, life
               hasEpochEnded={hasEpochEnded}
               allUsersActivity={allUsersActivity as StakeActivityResponse}
               isAllActivitiesLoading={isAllActivitiesLoading}
-              refetchActivity={refetchActivity}
+              refetchActivity={() => {
+                refetchActivity();
+                refetchSendActivities();
+              }}
               lifeTime={lifeTime}
             />
           ))}
diff --git a/src/modules/rewards/hooks/useDailyRewards.tsx b/src/modules/rewards/hooks/useDailyRewards.tsx
index 366642bdd1..61a21d5e17 100644
--- a/src/modules/rewards/hooks/useDailyRewards.tsx
+++ b/src/modules/rewards/hooks/useDailyRewards.tsx
@@ -96,8 +96,20 @@ const useDailyRewards = () => {
       }
     }
 
-    setActiveDay(newDay);
-    setActiveItem(newDayData);
+    // first day data after completing all 7
+    const firstDayData = dailyRewardsActivities?.find(
+      (activity) => activity.activityType === `daily_check_in_7_days_day1`
+    );
+
+    // if active day is complete, reset to first day, if not use the next day
+    if (newDay <= 7) {
+      setActiveDay(newDay);
+      setActiveItem(newDayData);
+    } else {
+      setActiveDay(1);
+      setActiveItem(firstDayData);
+    }
+
     setIsLoadingRewards(false);
   }, [sendRecentActivities]);
 
diff --git a/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx b/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
index 74cc6d5750..6e789562b2 100644
--- a/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
+++ b/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
@@ -65,7 +65,7 @@ const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
 
   const activityTitles = allPushArray?.map((activity) => activity.activityType);
 
-  const { data: sendRecentActivities } = useGetRewardActivityStatus(
+  const { data: sendRecentActivities, refetch: refetchSendActivities } = useGetRewardActivityStatus(
     {
       userId: userDetails?.userId as string,
       activities: activityTitles as string[],
@@ -80,6 +80,7 @@ const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
     const differenceInSeconds = (resetDate as number) - currentTime;
     return Math.floor(differenceInSeconds / (60 * 60 * 24));
   }, [resetDate]);
+  // const daysToReset = -2;
 
   // Helper function to check if 7 days have passed since the stored epoch time (in seconds)
   const hasSevenDaysPassed = (storedEpochTime: number) => {
@@ -126,7 +127,8 @@ const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
       updateResetDate(latestTimestamp);
     }
 
-    if (!isEpochActive && isPastSevenDays) {
+    if (!isEpochActive) {
+      // if (!isEpochActive && isPastSevenDays) {
       setResetEpoch(true);
       console.log(`${stakeType} epoch is reset`);
     } else {
@@ -135,8 +137,6 @@ const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
     }
   };
 
-  // console.log(daysToReset, 'daysToReset');
-
   // Effect for handling fetch data for both arrays
   useEffect(() => {
     if (
@@ -154,7 +154,7 @@ const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
     }
   }, [userDetails?.userId, isWalletConnected, isLoadingPushStakeData, isLoadingPushUniData, sendRecentActivities]);
 
-  return { stakePushArray, uniV2PushArray, isLoading, daysToReset };
+  return { stakePushArray, uniV2PushArray, isLoading, daysToReset, refetchSendActivities };
 };
 
 export { useStakeRewardsResetTime };
diff --git a/src/modules/rewards/utils/activityTypeArray.ts b/src/modules/rewards/utils/activityTypeArray.ts
index 56968897bb..c8929d4873 100644
--- a/src/modules/rewards/utils/activityTypeArray.ts
+++ b/src/modules/rewards/utils/activityTypeArray.ts
@@ -21,6 +21,7 @@ export const channelSubscriptionActivities: ActvityType[] = [
   'channel_specific_subscriptions:REVOKE_NOTIFICATIONS_CHANNEL',
   'channel_specific_subscriptions:PWN_NOTIFICATIONS_CHANNEL',
   'channel_specific_subscriptions:UNSTOPPABLE_DOMAINS_CHANNEL',
+  'channel_specific_subscriptions:BTC_PRICE_TRACKER_CHANNEL',
 ];
 
 export const bonusRewardActivities: ActvityType[] = [
diff --git a/src/queries/hooks/chat/index.ts b/src/queries/hooks/chat/index.ts
new file mode 100644
index 0000000000..11c0ddb952
--- /dev/null
+++ b/src/queries/hooks/chat/index.ts
@@ -0,0 +1 @@
+export * from './useGetGroupInfo';
diff --git a/src/queries/hooks/chat/useGetGroupInfo.ts b/src/queries/hooks/chat/useGetGroupInfo.ts
new file mode 100644
index 0000000000..c23394e410
--- /dev/null
+++ b/src/queries/hooks/chat/useGetGroupInfo.ts
@@ -0,0 +1,26 @@
+import { useQuery, UseQueryOptions } from '@tanstack/react-query';
+import { useSelector } from 'react-redux';
+
+import { groupInfo } from '../../queryKeys';
+import { getGroupInfo } from '../../services';
+
+import { UserStoreType } from 'types';
+import { GroupInfoResponse } from '../../types';
+
+/**
+ * @param chainId
+ * @returns query response
+ */
+export const useGetGroupInfo = (chatId?: string, config?: Partial<UseQueryOptions<GroupInfoResponse>>) => {
+  const { userPushSDKInstance } = useSelector((state: UserStoreType) => {
+    return state.user;
+  });
+
+  const query = useQuery<GroupInfoResponse>({
+    queryKey: [groupInfo, userPushSDKInstance?.account, chatId],
+    enabled: !!chatId,
+    queryFn: () => getGroupInfo(userPushSDKInstance, chatId!),
+    ...config,
+  });
+  return query;
+};
diff --git a/src/queries/hooks/index.ts b/src/queries/hooks/index.ts
index af7cf2c265..5ceff9be7e 100644
--- a/src/queries/hooks/index.ts
+++ b/src/queries/hooks/index.ts
@@ -1,5 +1,6 @@
 export * from './createChannel';
 export * from './channels';
+export * from './chat';
 export * from './user';
 export * from './rewards';
 export * from './pointsVault';
diff --git a/src/queries/hooks/rewards/index.ts b/src/queries/hooks/rewards/index.ts
index ee6ba806a3..7609e40628 100644
--- a/src/queries/hooks/rewards/index.ts
+++ b/src/queries/hooks/rewards/index.ts
@@ -7,4 +7,5 @@ export * from './useCreateRewardsUser';
 export * from './useGetRewardsLedearboard';
 export * from './useGetRewardActivityStatus';
 export * from './useGetPushStakeEpoch';
+export * from './useGetPreviousPushStakeEpoch';
 export * from './useGetUniV2StakeEpoch';
diff --git a/src/queries/hooks/rewards/useGetPreviousPushStakeEpoch.ts b/src/queries/hooks/rewards/useGetPreviousPushStakeEpoch.ts
new file mode 100644
index 0000000000..0b1114130e
--- /dev/null
+++ b/src/queries/hooks/rewards/useGetPreviousPushStakeEpoch.ts
@@ -0,0 +1,9 @@
+import { useQuery } from '@tanstack/react-query';
+import { getPreviousPushStakeEpoch } from 'queries';
+import { pushPreviousStakeEpoch } from 'queries/queryKeys';
+
+export const useGetPreviousPushStakeEpoch = () =>
+  useQuery({
+    queryKey: [pushPreviousStakeEpoch],
+    queryFn: getPreviousPushStakeEpoch,
+  });
diff --git a/src/queries/hooks/user/index.ts b/src/queries/hooks/user/index.ts
index 74c502c479..8b2966f7e5 100644
--- a/src/queries/hooks/user/index.ts
+++ b/src/queries/hooks/user/index.ts
@@ -7,3 +7,4 @@ export * from './useUpdateUserProfileInfo';
 export * from './useSendHandlesVerificationCode';
 export * from './useVerifyHandlesVerificationCode';
 export * from './useGetSocialsStatus';
+export * from './useGetUserProfileDetails';
diff --git a/src/queries/hooks/user/useGetUserProfileDetails.ts b/src/queries/hooks/user/useGetUserProfileDetails.ts
new file mode 100644
index 0000000000..f109872ef4
--- /dev/null
+++ b/src/queries/hooks/user/useGetUserProfileDetails.ts
@@ -0,0 +1,29 @@
+import { useQuery, UseQueryOptions } from '@tanstack/react-query';
+import { useSelector } from 'react-redux';
+
+import { userProfileDetails } from '../../queryKeys';
+import { getUserProfileDetails } from '../../services';
+
+import { UserStoreType } from 'types';
+import { UserProfileDetailsResponse } from '../../types';
+
+/**
+ * @param userAddress
+ * @returns query response
+ */
+export const useGetUserProfileDetails = (
+  userAddress?: string,
+  config?: Partial<UseQueryOptions<UserProfileDetailsResponse>>
+) => {
+  const { userPushSDKInstance } = useSelector((state: UserStoreType) => {
+    return state.user;
+  });
+
+  const query = useQuery<UserProfileDetailsResponse>({
+    queryKey: [userProfileDetails, userPushSDKInstance?.account, userAddress],
+    enabled: !!userAddress,
+    queryFn: () => getUserProfileDetails(userPushSDKInstance, userAddress!),
+    ...config,
+  });
+  return query;
+};
diff --git a/src/queries/models/chat/getGroupInfoModelCreator.ts b/src/queries/models/chat/getGroupInfoModelCreator.ts
new file mode 100644
index 0000000000..520141820c
--- /dev/null
+++ b/src/queries/models/chat/getGroupInfoModelCreator.ts
@@ -0,0 +1,4 @@
+import { GroupInfoResponse } from '../../types';
+
+//any remodelling needed in the response can be done here
+export const getGroupInfoModelCreator = (response: GroupInfoResponse): GroupInfoResponse => response;
diff --git a/src/queries/models/chat/index.ts b/src/queries/models/chat/index.ts
new file mode 100644
index 0000000000..09b7b550d4
--- /dev/null
+++ b/src/queries/models/chat/index.ts
@@ -0,0 +1 @@
+export * from './getGroupInfoModelCreator';
diff --git a/src/queries/models/index.ts b/src/queries/models/index.ts
index fdcb1f07a9..66edccfb44 100644
--- a/src/queries/models/index.ts
+++ b/src/queries/models/index.ts
@@ -2,3 +2,4 @@ export * from './channels';
 export * from './user';
 export * from './rewards';
 export * from './pointsVault';
+export * from './chat';
diff --git a/src/queries/models/rewards/getPreviousPushStakeEpochModel.ts b/src/queries/models/rewards/getPreviousPushStakeEpochModel.ts
new file mode 100644
index 0000000000..0184e1d452
--- /dev/null
+++ b/src/queries/models/rewards/getPreviousPushStakeEpochModel.ts
@@ -0,0 +1,3 @@
+import { RewardsStakeParams } from 'queries/types';
+
+export const getPreviousPushStakeEpochModel = (response: RewardsStakeParams): RewardsStakeParams => response;
diff --git a/src/queries/models/rewards/index.ts b/src/queries/models/rewards/index.ts
index cb8c48e292..f6d00ceca4 100644
--- a/src/queries/models/rewards/index.ts
+++ b/src/queries/models/rewards/index.ts
@@ -7,4 +7,5 @@ export * from './createUserRewardsDetailsModel';
 export * from './getRewardsLeaderboardModalCreator';
 export * from './getRewardActivityStatusModel';
 export * from './getPushStakeEpochModel';
+export * from './getPreviousPushStakeEpochModel';
 export * from './getUniV2StakeEpochModel';
diff --git a/src/queries/models/user/getUserProfileDetailsModelCreator.ts b/src/queries/models/user/getUserProfileDetailsModelCreator.ts
new file mode 100644
index 0000000000..c44fc6bf87
--- /dev/null
+++ b/src/queries/models/user/getUserProfileDetailsModelCreator.ts
@@ -0,0 +1,5 @@
+import { UserProfileDetailsResponse } from '../../types';
+
+//any remodelling needed in the response can be done here
+export const getUserProfileDetailsModelCreator = (response: UserProfileDetailsResponse): UserProfileDetailsResponse =>
+  response;
diff --git a/src/queries/models/user/index.ts b/src/queries/models/user/index.ts
index c95226b09e..49ad9da1f6 100644
--- a/src/queries/models/user/index.ts
+++ b/src/queries/models/user/index.ts
@@ -3,3 +3,4 @@ export * from './getUserProfileInfoModelCreator';
 export * from './sendHandlesVerificationCodeModelCreator';
 export * from './verifyHandlesVerificationCodeModelCreator';
 export * from './getSocialsStatusModelCreator';
+export * from './getUserProfileDetailsModelCreator';
diff --git a/src/queries/queryKeys.ts b/src/queries/queryKeys.ts
index 0c975f2fb4..6b531599c0 100644
--- a/src/queries/queryKeys.ts
+++ b/src/queries/queryKeys.ts
@@ -18,12 +18,14 @@ export const creatingNewChannel = 'creatingNewChannel';
 export const deactivatingChannel = 'deactivatingChannel';
 export const discordDetails = 'discordDetails';
 export const generateUserIdByWallet = 'generateUserIdByWallet';
+export const groupInfo = 'groupInfo';
 export const initiateNewChain = 'initiateNewChain';
 export const pointsVaultApprovedUsers = 'pointsVaultApprovedUsers';
 export const pointsVaultPendingUsers = 'pointsVaultPendingUsers';
 export const pointsVaultRejectedUsers = 'pointsVaultRejectedUsers';
 export const pointsVaultSearch = 'pointsVaultSearch';
 export const pointsVaultUserLoginKey = 'pointsVaultUserLogin';
+export const pushPreviousStakeEpoch = 'pushPreviousStakeEpoch';
 export const pushStakeEpoch = 'pushStakeEpoch';
 export const reactivatingChannel = 'reactivatingChannel';
 export const rejectVaultUser = 'rejectVaultUser';
@@ -50,4 +52,5 @@ export const UserRewardsDetails = 'userRewardsDetails';
 export const userSocialStatus = 'userSocialStatus';
 export const userSubscription = 'userSubscription';
 export const userTwitterDetails = 'userTwitterDetails';
+export const userProfileDetails = 'userProfileDetails';
 export const verifyAliasChain = 'verifyAliasChain';
diff --git a/src/queries/services/chat/getGroupInfo.ts b/src/queries/services/chat/getGroupInfo.ts
new file mode 100644
index 0000000000..61b0724718
--- /dev/null
+++ b/src/queries/services/chat/getGroupInfo.ts
@@ -0,0 +1,5 @@
+import { PushAPI } from '@pushprotocol/restapi';
+import { getGroupInfoModelCreator } from '../../models';
+
+export const getGroupInfo = (userPushSDKInstance: PushAPI, chatId: string) =>
+  userPushSDKInstance.chat.group.info(chatId).then(getGroupInfoModelCreator);
diff --git a/src/queries/services/chat/index.ts b/src/queries/services/chat/index.ts
new file mode 100644
index 0000000000..df1c03bbc6
--- /dev/null
+++ b/src/queries/services/chat/index.ts
@@ -0,0 +1 @@
+export * from './getGroupInfo';
diff --git a/src/queries/services/index.ts b/src/queries/services/index.ts
index 632b38dfaa..0697336462 100644
--- a/src/queries/services/index.ts
+++ b/src/queries/services/index.ts
@@ -5,3 +5,4 @@ export * from './pointsVault';
 export * from './createChannel';
 export * from './analytics';
 export * from './notificationSettings';
+export * from './chat';
diff --git a/src/queries/services/rewards/getPreviousPushStakeEpoch.ts b/src/queries/services/rewards/getPreviousPushStakeEpoch.ts
new file mode 100644
index 0000000000..45d6f69045
--- /dev/null
+++ b/src/queries/services/rewards/getPreviousPushStakeEpoch.ts
@@ -0,0 +1,10 @@
+import axios from 'axios';
+
+import { getRewardsBaseURL } from '../../baseURL';
+import { getPreviousPushStakeEpochModel } from 'queries/models';
+
+export const getPreviousPushStakeEpoch = () =>
+  axios({
+    method: 'GET',
+    url: `${getRewardsBaseURL()}/staking/push/previous-epoch-blocks`,
+  }).then((response) => getPreviousPushStakeEpochModel(response.data));
diff --git a/src/queries/services/rewards/index.ts b/src/queries/services/rewards/index.ts
index 85434d4bd6..61f7d46820 100644
--- a/src/queries/services/rewards/index.ts
+++ b/src/queries/services/rewards/index.ts
@@ -7,4 +7,5 @@ export * from './createUserRewardsDetail.ts';
 export * from './getRewardsLeaderboard';
 export * from './getRewardActivityStatus.ts';
 export * from './getPushStakeEpoch.ts';
+export * from './getPreviousPushStakeEpoch.ts';
 export * from './getUniV2StakeEpoch.ts';
diff --git a/src/queries/services/user/getUserProfileDetails.ts b/src/queries/services/user/getUserProfileDetails.ts
new file mode 100644
index 0000000000..0cc61ff422
--- /dev/null
+++ b/src/queries/services/user/getUserProfileDetails.ts
@@ -0,0 +1,5 @@
+import { PushAPI } from '@pushprotocol/restapi';
+import { getUserProfileDetailsModelCreator } from 'queries/models';
+
+export const getUserProfileDetails = (userPushSDKInstance: PushAPI, address: string) =>
+  userPushSDKInstance.profile.info({ overrideAccount: address }).then(getUserProfileDetailsModelCreator);
diff --git a/src/queries/services/user/index.ts b/src/queries/services/user/index.ts
index 89072fa57d..75b30c5c83 100644
--- a/src/queries/services/user/index.ts
+++ b/src/queries/services/user/index.ts
@@ -7,3 +7,4 @@ export * from './updateUserProfileInfo';
 export * from './sendHandlesVerificationCode';
 export * from './verifyHandlesVerificationCode';
 export * from './getUserSocialsStatus';
+export * from './getUserProfileDetails';
diff --git a/src/queries/types/chat.ts b/src/queries/types/chat.ts
new file mode 100644
index 0000000000..1d742c1797
--- /dev/null
+++ b/src/queries/types/chat.ts
@@ -0,0 +1,3 @@
+import { GroupDTO, GroupInfoDTO } from '@pushprotocol/restapi';
+
+export type GroupInfoResponse = GroupDTO | GroupInfoDTO;
diff --git a/src/queries/types/index.ts b/src/queries/types/index.ts
index a99590a6c3..05869cb58f 100644
--- a/src/queries/types/index.ts
+++ b/src/queries/types/index.ts
@@ -4,3 +4,4 @@ export * from './rewards';
 export * from './pointsVault';
 export * from './createChannel';
 export * from './notificationsettings';
+export * from './chat';
diff --git a/src/queries/types/rewards.ts b/src/queries/types/rewards.ts
index ca9b94d69c..aa976edca9 100644
--- a/src/queries/types/rewards.ts
+++ b/src/queries/types/rewards.ts
@@ -32,6 +32,7 @@ export type ActvityType =
   | 'daily_check_in_7_days_day5'
   | 'daily_check_in_7_days_day6'
   | 'daily_check_in_7_days_day7'
+  | 'channel_specific_subscriptions:BTC_PRICE_TRACKER_CHANNEL'
   | 'channel_specific_subscriptions:QUICKSWAP_CHANNEL'
   | 'channel_specific_subscriptions:WALLETTRACKER_CHANNEL'
   | 'channel_specific_subscriptions:PRICETRACKER_CHANNEL'
@@ -93,7 +94,10 @@ export type UsersActivity = {
   activityId: string;
   userId: string;
   activityTypeId: string;
-  data: { twitter?: string; discord?: string };
+  data:
+    | { twitter?: string; discord?: string }
+    | { currentEpoch?: number; fromBlock?: number; toBlock?: number; fromTimestamp?: number; toTimestamp?: number }
+    | any;
   status: 'COMPLETED' | 'PENDING' | 'REJECTED';
   points: number;
   multiplier: number;
diff --git a/src/queries/types/user.ts b/src/queries/types/user.ts
index 3c6a3e2f87..9a393c2633 100644
--- a/src/queries/types/user.ts
+++ b/src/queries/types/user.ts
@@ -63,4 +63,13 @@ export type UserSocialStatusResponse = {
   email: string | null;
   telegram_username: string | null;
   discord_username: string | null;
+ };
+
+export type UserProfileDetailsResponse = {
+  blockedUsersList: Array<string>;
+  desc: string | null;
+  name: string | null;
+  picture: string;
+  profileVerificationProof: string | null;
 };
+
diff --git a/yarn.lock b/yarn.lock
index 96543abe1c..9d90fc1436 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3952,9 +3952,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pushprotocol/restapi@npm:1.7.25":
-  version: 1.7.25
-  resolution: "@pushprotocol/restapi@npm:1.7.25"
+"@pushprotocol/restapi@npm:1.7.29":
+  version: 1.7.29
+  resolution: "@pushprotocol/restapi@npm:1.7.29"
   dependencies:
     "@metamask/eth-sig-util": "npm:^5.0.2"
     axios: "npm:^0.27.2"
@@ -3977,7 +3977,7 @@ __metadata:
   peerDependenciesMeta:
     ethers:
       optional: true
-  checksum: 10/1da9268e81c3038871904336f16b6161fb039e9d0995a060f403f95c553a8ca8c9faada73c1806fb8ba3557cbdcc33b53c0e223c4cb743ddc9ed24da0b91c992
+  checksum: 10/13afab4147598627c470f09706b859af116ffd4831bbb4de1e2f6b3490b5c10f5f06754b820a766614ac145912b9a455c974570a2763b82289aa57f37d55421a
   languageName: node
   linkType: hard
 
@@ -3993,9 +3993,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pushprotocol/uiweb@npm:1.7.1":
-  version: 1.7.1
-  resolution: "@pushprotocol/uiweb@npm:1.7.1"
+"@pushprotocol/uiweb@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@pushprotocol/uiweb@npm:1.7.2"
   dependencies:
     "@livekit/components-react": "npm:^1.2.2"
     "@livekit/components-styles": "npm:^1.0.6"
@@ -4029,7 +4029,7 @@ __metadata:
     react-twitter-embed: "npm:^4.0.4"
     uuid: "npm:^9.0.1"
   peerDependencies:
-    "@pushprotocol/restapi": 1.7.25
+    "@pushprotocol/restapi": 1.7.29
     "@pushprotocol/socket": ^0.5.0
     axios: ^0.27.2
     openpgp: ^5.8.0
@@ -4037,7 +4037,7 @@ __metadata:
     react-dom: 17.0.2
     styled-components: ^6.0.8
     viem: ^1.3.0
-  checksum: 10/218d56a0f9df43755ae8988cec94e93af7c8c4b5db5c88acee3a9062e0a6c1cbb510e43cd7706cf1b679964bf9cee6148f62e69f4d932560bfd1d6cdea785b8a
+  checksum: 10/8594689a4c814dae1cbc43500ae6e16e04a3cdadfc0b81130796ad06f64268e6b8ff986686323911266700972ec3a64870b335a97ed4e8766e826cbc504f13cf
   languageName: node
   linkType: hard
 
@@ -18347,9 +18347,9 @@ __metadata:
     "@metamask/eth-sig-util": "npm:^4.0.0"
     "@mui/icons-material": "npm:^5.8.4"
     "@mui/material": "npm:^5.5.0"
-    "@pushprotocol/restapi": "npm:1.7.25"
+    "@pushprotocol/restapi": "npm:1.7.29"
     "@pushprotocol/socket": "npm:0.5.3"
-    "@pushprotocol/uiweb": "npm:1.7.1"
+    "@pushprotocol/uiweb": "npm:1.7.2"
     "@radix-ui/react-dialog": "npm:^1.1.1"
     "@radix-ui/react-dropdown-menu": "npm:^2.1.1"
     "@radix-ui/react-switch": "npm:^1.1.0"