(EnvContext);
-
-
- // usePushChatSocket();
-
-
return (
Chat UI Test page
- {/* */}
-
-
-
+
- {/* */}
);
};
export default ChatViewListTest;
-
const ChatViewListCard = styled.div`
-height:40vh;
-background:black;
-overflow: auto;
-overflow-x: hidden;
-`;
\ No newline at end of file
+ height: 40vh;
+ background: black;
+ overflow: auto;
+ overflow-x: hidden;
+`;
diff --git a/packages/examples/sdk-frontend-react/src/app/app.tsx b/packages/examples/sdk-frontend-react/src/app/app.tsx
index 57d3ab843..80f7dd776 100644
--- a/packages/examples/sdk-frontend-react/src/app/app.tsx
+++ b/packages/examples/sdk-frontend-react/src/app/app.tsx
@@ -340,13 +340,7 @@ export function App() {
-
+
= (options: IChatViewLis
return () => clearTimeout(timer);
}
-
- return () => {};
}, [chatAcceptStream, participantJoinStream]);
// Change listtype to 'UINITIALIZED' and hidden to true when participantRemoveStream or participantLeaveStream is received
diff --git a/packages/uiweb/src/lib/components/chat/ConnectButton/index.tsx b/packages/uiweb/src/lib/components/chat/ConnectButton/index.tsx
index c4dea01db..d5457ba77 100644
--- a/packages/uiweb/src/lib/components/chat/ConnectButton/index.tsx
+++ b/packages/uiweb/src/lib/components/chat/ConnectButton/index.tsx
@@ -1,9 +1 @@
export { ConnectButton } from './ConnectButton';
-
-// interface IConnectButtonCompProps {
-// autoConnect?: boolean;
-// }
-
-// export const ConnectButtonComp: React.FC = ({ autoConnect }) => {
-// return ;
-// };
diff --git a/packages/uiweb/src/lib/components/widget/helpers/notifications.ts b/packages/uiweb/src/lib/components/widget/helpers/notifications.ts
index cc139590a..af441f4a9 100644
--- a/packages/uiweb/src/lib/components/widget/helpers/notifications.ts
+++ b/packages/uiweb/src/lib/components/widget/helpers/notifications.ts
@@ -2,13 +2,10 @@ import { NotificationSettingType, UserSetting } from '@pushprotocol/restapi';
const isSettingType1 = (setting: NotificationSettingType) => setting.type === 1;
-export const notifUserSettingFormatString = ({
- settings,
-}: {
- settings: NotificationSettingType[];
-}) => {
+export const notifUserSettingFormatString = ({ settings }: { settings: NotificationSettingType[] }) => {
const _notifSettings: UserSetting[] = [];
settings &&
+ settings.length &&
settings.forEach((setting) =>
isSettingType1(setting)
? _notifSettings.push({
@@ -21,38 +18,32 @@ export const notifUserSettingFormatString = ({
);
return _notifSettings;
};
-export const notifStrictUserSettingFromat = ({
- settings,
-}: {
- settings: NotificationSettingType[];
-}) => {
+export const notifStrictUserSettingFromat = ({ settings }: { settings: NotificationSettingType[] }) => {
const _notifSettings: NotificationSettingType[] = [];
settings &&
- settings.forEach((setting) =>
- isSettingType1(setting)
- ? _notifSettings.push({
- ...setting,
- userPreferance: setting?.userPreferance?? {value:0,enabled:false},
- })
- : _notifSettings.push({
- ...setting,
- userPreferance: setting?.userPreferance?? {
- value: setting.default ||0,
- enabled: false,
- }
- })
- );
+ settings.length &&
+ settings.forEach((setting) =>
+ isSettingType1(setting)
+ ? _notifSettings.push({
+ ...setting,
+ userPreferance: setting?.userPreferance ?? { value: 0, enabled: false },
+ })
+ : _notifSettings.push({
+ ...setting,
+ userPreferance: setting?.userPreferance ?? {
+ value: setting.default || 0,
+ enabled: false,
+ },
+ })
+ );
return _notifSettings;
};
-export const notifUserSettingFromChannelSetting = ({
- settings
-}: {
- settings: any[];
-}) => {
+export const notifUserSettingFromChannelSetting = ({ settings }: { settings: any[] }) => {
const _userSettings: NotificationSettingType[] = [];
settings &&
+ settings.length &&
settings.forEach((setting) =>
isSettingType1(setting)
? _userSettings.push({
diff --git a/packages/uiweb/src/lib/components/widget/subscriptionManager/ManageNotificationComponent.tsx b/packages/uiweb/src/lib/components/widget/subscriptionManager/ManageNotificationComponent.tsx
index 85cb30ada..d54ed4d3d 100644
--- a/packages/uiweb/src/lib/components/widget/subscriptionManager/ManageNotificationComponent.tsx
+++ b/packages/uiweb/src/lib/components/widget/subscriptionManager/ManageNotificationComponent.tsx
@@ -39,7 +39,7 @@ export const ManageNotficationsComponent: React.FC {
const { userSettings, channelAddress, channelInfo, handleNext, autoconnect = false } = options || {};
- const [modifiedSettings, setModifiedSettings] = useState([...userSettings]);
+ const [modifiedSettings, setModifiedSettings] = useState([...userSettings]);
const {
unsubscribeError,
unsubscribeLoading,
diff --git a/packages/uiweb/src/lib/components/widget/subscriptionManager/SettingsComponents.tsx b/packages/uiweb/src/lib/components/widget/subscriptionManager/SettingsComponents.tsx
index dcf39c519..cae76f5f1 100644
--- a/packages/uiweb/src/lib/components/widget/subscriptionManager/SettingsComponents.tsx
+++ b/packages/uiweb/src/lib/components/widget/subscriptionManager/SettingsComponents.tsx
@@ -19,20 +19,13 @@ interface IThemeProps {
interface ISettingsComponentProps {
settings: PushAPI.NotificationSettingType[];
- setSettings: React.Dispatch<
- React.SetStateAction
- >;
+ setSettings: React.Dispatch>;
}
-export const SettingsComponent: React.FC = (
- options: ISettingsComponentProps
-) => {
+export const SettingsComponent: React.FC = (options: ISettingsComponentProps) => {
const theme = useContext(ThemeContext);
const { settings = [], setSettings } = options || {};
- const handleSliderChange = (
- index: number,
- value: number | { lower: number; upper: number }
- ) => {
+ const handleSliderChange = (index: number, value: number | { lower: number; upper: number }) => {
const updatedSettings = [...settings];
updatedSettings[index].userPreferance!.value = value;
@@ -41,9 +34,8 @@ export const SettingsComponent: React.FC = (
const handleToggleChange = (index: number) => {
const updatedSettings = [...settings];
- if(updatedSettings[index]?.userPreferance)
- updatedSettings[index].userPreferance!.enabled =
- !updatedSettings[index].userPreferance!.enabled;
+ if (updatedSettings[index]?.userPreferance)
+ updatedSettings[index].userPreferance!.enabled = !updatedSettings[index].userPreferance!.enabled;
setSettings(updatedSettings);
};
return (
@@ -53,11 +45,12 @@ export const SettingsComponent: React.FC = (
gap="15px"
width="100%"
maxHeight="200px"
- justifyContent='start'
+ justifyContent="start"
overflow="hidden scroll"
>
- {settings.map(
- (setting: PushAPI.NotificationSettingType, index: number) => (
+ {settings &&
+ settings?.length &&
+ settings?.map((setting: PushAPI.NotificationSettingType, index: number) => (
= (
{(setting.type == 2 || setting.type == 1) && (
{
handleToggleChange(index);
}}
/>
)}
-
{setting.type == 2 && setting?.userPreferance?.enabled && (
= (
onChange={({ x }) => handleSliderChange(index, x)}
/>
)}
+ {/* uncomment this when we need this to be included in the settings feature
+ not needed as of now */}
{/* {setting.type == 3 && setting?.userPreferance?.enabled && (
= (
/>
)} */}
- )
- )}
+ ))}
);
};
const SettingsSection = styled(Section)`
- border-bottom: ${(props) =>
- props.divider ? props.theme.border?.divider : 'none'};
+ border-bottom: ${(props) => (props.divider ? props.theme.border?.divider : 'none')};
padding-bottom: 15px;
`;
const ScrollSection = styled(Section)<{ theme: IWidgetTheme }>`
diff --git a/packages/uiweb/src/lib/components/widget/subscriptionManager/SubscribeComponent.tsx b/packages/uiweb/src/lib/components/widget/subscriptionManager/SubscribeComponent.tsx
index 250042386..dff1838d6 100644
--- a/packages/uiweb/src/lib/components/widget/subscriptionManager/SubscribeComponent.tsx
+++ b/packages/uiweb/src/lib/components/widget/subscriptionManager/SubscribeComponent.tsx
@@ -37,12 +37,12 @@ export const SubscribeComponent: React.FC = (options:
const theme = useContext(ThemeContext);
const { signer, setAccount, setSigner, user, account } = useWidgetData();
const subscribeToast = useToast();
- const [modifiedSettings, setModifiedSettings] = useState(
+ const [modifiedSettings, setModifiedSettings] = useState(
useMemo(() => {
if (channelInfo && channelInfo?.channel_settings) {
return notifUserSettingFromChannelSetting({ settings: JSON.parse(channelInfo?.channel_settings) });
}
- return null;
+ return [];
}, [channelInfo])
);
@@ -51,7 +51,7 @@ export const SubscribeComponent: React.FC = (options:
const response = await subscribeToChannel({
channelAddress: channelAddress,
channelSettings: notifUserSettingFormatString({
- settings: modifiedSettings!,
+ settings: modifiedSettings,
}),
});
if (response && response?.status === 204) {
diff --git a/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx b/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx
index d1c5f02fe..0e1997857 100644
--- a/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx
+++ b/packages/uiweb/src/lib/dataProviders/Web3OnboardDataProvider.tsx
@@ -7,8 +7,9 @@ import walletConnectModule from '@web3-onboard/walletconnect';
import init from '@web3-onboard/core';
import PushIcon from '../icons/Bell.svg';
import { ReactNode } from 'react';
+import { AppMetaDataType, ChainType } from '../types';
-const APP_META_DATA = {
+const APP_META_DATA: AppMetaDataType = {
name: 'Push Protocol',
logo: PushIcon,
icon: PushIcon,
@@ -24,7 +25,7 @@ const wcv2InitOptions = {
const walletConnect = walletConnectModule(wcv2InitOptions);
const coinbaseWalletSdk = coinbaseWalletModule({ darkMode: true });
-const CHAINS = [
+const CHAINS: ChainType[] = [
{
id: '0x1',
token: 'ETH',
diff --git a/packages/uiweb/src/lib/types/index.ts b/packages/uiweb/src/lib/types/index.ts
index d46024476..e9267943f 100644
--- a/packages/uiweb/src/lib/types/index.ts
+++ b/packages/uiweb/src/lib/types/index.ts
@@ -127,12 +127,12 @@ export const SIDEBAR_PLACEHOLDER_KEYS = {
NEW_CHAT: 'NEW_CHAT',
} as const;
-export type SidebarPlaceholderKeys = typeof SIDEBAR_PLACEHOLDER_KEYS[keyof typeof SIDEBAR_PLACEHOLDER_KEYS];
+export type SidebarPlaceholderKeys = (typeof SIDEBAR_PLACEHOLDER_KEYS)[keyof typeof SIDEBAR_PLACEHOLDER_KEYS];
-export type LocalStorageKeys = typeof LOCAL_STORAGE_KEYS[keyof typeof LOCAL_STORAGE_KEYS];
-export type PushTabs = typeof PUSH_TABS[keyof typeof PUSH_TABS];
-export type PushSubTabs = typeof PUSH_SUB_TABS[keyof typeof PUSH_SUB_TABS];
-export type SocketType = typeof SOCKET_TYPE[keyof typeof SOCKET_TYPE];
+export type LocalStorageKeys = (typeof LOCAL_STORAGE_KEYS)[keyof typeof LOCAL_STORAGE_KEYS];
+export type PushTabs = (typeof PUSH_TABS)[keyof typeof PUSH_TABS];
+export type PushSubTabs = (typeof PUSH_SUB_TABS)[keyof typeof PUSH_SUB_TABS];
+export type SocketType = (typeof SOCKET_TYPE)[keyof typeof SOCKET_TYPE];
export interface FileMessageContent {
content: string;
@@ -215,3 +215,22 @@ export interface IFrame {
frameDetails?: FrameDetails;
message?: string;
}
+
+export type WalletType = {
+ name: string;
+ url: string;
+};
+
+export type AppMetaDataType = {
+ name: string;
+ logo: string;
+ icon: string;
+ description: string;
+ recommendedInjectedWallets: WalletType[];
+};
+export type ChainType = {
+ id: string; // Assuming all IDs are in hexadecimal string format
+ token: string;
+ label: string;
+ rpcUrl: string;
+};