Skip to content

Commit eca068a

Browse files
fix: Remove verification status step during initialization
* fix: Remove verification status step during initialization * build: Update package lock * 1.1.1-rc.0 * fix: Update the changelog * fix: Update version of sirenapp js * fix: Update package lock --------- Co-authored-by: cizil-keyvalue <[email protected]>
1 parent 146aabd commit eca068a

File tree

7 files changed

+2908
-4513
lines changed

7 files changed

+2908
-4513
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
6+
## 1.2.2
7+
8+
### Fixed
9+
10+
- Remove the verification status functionality, as verify token calls have been removed from '@sirenapp/js-sdk' to prevent issues caused by multiple calls.
11+
12+
513
## 1.2.1
614

715
### Fixed

package-lock.json

Lines changed: 2886 additions & 4462 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"typescript": "^5.3.3"
8585
},
8686
"dependencies": {
87-
"pubsub-js": "^1.9.4",
88-
"@sirenapp/js-sdk": "^1.2.2"
87+
"@sirenapp/js-sdk": "^1.2.3",
88+
"pubsub-js": "^1.9.4"
8989
}
9090
}

src/components/SirenPanel.tsx

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
mergeStyles,
2929
updateNotifications,
3030
} from "../utils/commonUtils";
31-
import { DEFAULT_WINDOW_TITLE, ERROR_TEXT, errorMap, events, EventType, eventTypes, LIST_EMPTY_TEXT, Tabs, UNREAD_LIST_EMPTY_TEXT, VerificationStatus } from "../utils/constants";
31+
import { DEFAULT_WINDOW_TITLE, ERROR_TEXT, events, EventType, eventTypes, LIST_EMPTY_TEXT, Tabs, UNREAD_LIST_EMPTY_TEXT } from "../utils/constants";
3232
import useSiren from "../utils/sirenHook";
3333

3434
/**
@@ -102,7 +102,7 @@ const SirenPanel: FC<SirenPanelProps> = ({
102102
deleteByDate,
103103
deleteById,
104104
} = useSiren();
105-
const { siren, verificationStatus, id } = useSirenContext();
105+
const { siren, id } = useSirenContext();
106106
const {hideHeader = false, hideClearAll = false, customHeader, title = DEFAULT_WINDOW_TITLE} = headerProps ?? {};
107107
const [notifications, setNotifications] = useState<NotificationDataType[]>(
108108
[]
@@ -150,21 +150,12 @@ const SirenPanel: FC<SirenPanelProps> = ({
150150
}
151151
}, [eventListenerData]);
152152

153-
const handleVerificationFailure = () => {
154-
setIsLoading(false);
155-
onError && onError(errorMap?.INVALID_CREDENTIALS);
156-
setError(ERROR_TEXT);
157-
};
158-
159153
useEffect(() => {
160-
if (siren && verificationStatus === VerificationStatus.SUCCESS) {
154+
if (siren) {
161155
!hideBadge && siren.stopRealTimeFetch(EventType.UNVIEWED_COUNT);
162156
fetchNotifications(true);
163157
}
164-
else if(verificationStatus === VerificationStatus.FAILED) {
165-
handleVerificationFailure();
166-
}
167-
}, [siren, verificationStatus, hideBadge, activeTabIndex]);
158+
}, [siren, hideBadge, activeTabIndex]);
168159

169160
const restartNotificationCountFetch = () => {
170161
try {

src/components/SirenProvider.tsx

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
1+
import React, { createContext, useContext, useEffect, useMemo, useState } from "react";
22

33
import { Siren } from "@sirenapp/js-sdk";
44
import type {
@@ -18,12 +18,10 @@ import {
1818
eventTypes,
1919
IN_APP_RECIPIENT_UNAUTHENTICATED,
2020
MAXIMUM_RETRY_COUNT,
21-
VerificationStatus,
2221
} from "../utils/constants";
2322

2423
type SirenContextProp = {
2524
siren: Siren | null;
26-
verificationStatus: VerificationStatus;
2725
id: string;
2826
};
2927

@@ -34,7 +32,6 @@ interface SirenProvider {
3432

3533
export const SirenContext = createContext<SirenContextProp>({
3634
siren: null,
37-
verificationStatus: VerificationStatus.PENDING,
3835
id: ''
3936
});
4037

@@ -44,7 +41,6 @@ export const SirenContext = createContext<SirenContextProp>({
4441
* @example
4542
* const {
4643
* siren,
47-
* verificationStatus,
4844
* id
4945
* } = useSirenContext();
5046
*
@@ -56,7 +52,7 @@ export const useSirenContext = (): SirenContextProp => useContext(SirenContext);
5652
* Provides a React context for Siren notifications, making Siren SDK functionality
5753
* available throughout your React application.
5854
*
59-
* `SirenProvider` initializes the Siren SDK with given configuration and manages the state for siren and verificationStatus.
55+
* `SirenProvider` initializes the Siren SDK with given configuration and manages the state for siren.
6056
*
6157
* @component
6258
* @example
@@ -75,24 +71,17 @@ export const useSirenContext = (): SirenContextProp => useContext(SirenContext);
7571
*/
7672
const SirenProvider: React.FC<SirenProvider> = ({ config, children }) => {
7773
const [siren, setSiren] = useState<Siren | null>(null);
78-
const [verificationStatus, setVerificationStatus] =
79-
useState<VerificationStatus>(VerificationStatus.PENDING);
80-
const shouldInitialize = useRef(true);
8174
let retryCount = 0;
8275

8376

8477
const [id] = useState(generateUniqueId());
8578

8679
useEffect(() => {
87-
if (config?.recipientId && config?.userToken && shouldInitialize.current) {
88-
shouldInitialize.current = false;
80+
if (config?.recipientId && config?.userToken) {
8981
stopRealTimeFetch();
9082
sendResetDataEvents();
9183
initialize();
9284
}
93-
else {
94-
setVerificationStatus(VerificationStatus.FAILED);
95-
}
9685
if (retryCount > MAXIMUM_RETRY_COUNT) stopRealTimeFetch();
9786
}, [config]);
9887

@@ -146,11 +135,8 @@ const SirenProvider: React.FC<SirenProvider> = ({ config, children }) => {
146135
}
147136
};
148137

149-
const onStatusChange = (status: VerificationStatus) => {
150-
setVerificationStatus(status);
151-
};
152138

153-
const actionCallbacks = { onEventReceive, onStatusChange };
139+
const actionCallbacks = { onEventReceive };
154140

155141
const getDataParams = () => {
156142
return {
@@ -163,8 +149,8 @@ const SirenProvider: React.FC<SirenProvider> = ({ config, children }) => {
163149

164150
const retryVerification = (error: SirenErrorType) => {
165151
const shouldRetry = (error.Code === AUTHENTICATION_FAILED || error.Code === IN_APP_RECIPIENT_UNAUTHENTICATED) &&
166-
retryCount < MAXIMUM_RETRY_COUNT && verificationStatus === VerificationStatus.FAILED
167-
152+
retryCount < MAXIMUM_RETRY_COUNT
153+
168154
if (shouldRetry)
169155
setTimeout(() => {
170156
initialize();
@@ -177,15 +163,13 @@ const SirenProvider: React.FC<SirenProvider> = ({ config, children }) => {
177163
const dataParams: InitConfigType = getDataParams();
178164
const siren = new Siren(dataParams);
179165

180-
setVerificationStatus(VerificationStatus.PENDING);
181166
setSiren(siren);
182167
};
183168

184169
const contextValue = useMemo(() => ({
185170
id,
186171
siren,
187-
verificationStatus,
188-
}), [id, siren, verificationStatus]);
172+
}), [id, siren]);
189173

190174
return (
191175
<SirenContext.Provider

tests/components/sirenNotificationIcon.spec.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { fireEvent, render } from "@testing-library/react";
55
import SirenNotificationIcon from "../../src/components/SirenNotificationIcon";
66
import { SirenContext } from "../../src/components/SirenProvider"; // Assuming SirenProvider exports SirenContext
77
import { applyTheme } from "../../src/utils/commonUtils";
8-
import { VerificationStatus } from "../../src/utils/constants";
98

109
const mockClickFn = jest.fn();
1110

@@ -14,7 +13,6 @@ jest.mock("../../src/styles/sirenNotificationIcon.css", () => ({}));
1413

1514
const mockSirenContextValue = {
1615
siren: null,
17-
verificationStatus: VerificationStatus.SUCCESS,
1816
id: ''
1917
};
2018

tests/utils/sirenHook.spec.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Siren } from "@sirenapp/js-sdk";
22

33
import { useSiren } from "../../src";
44
import * as sirenProvider from "../../src/components/SirenProvider";
5-
import { errorMap, VerificationStatus } from "../../src/utils/constants";
5+
import { errorMap } from "../../src/utils/constants";
66

77

88
// Mock the CSS files to avoid Jest error
@@ -91,7 +91,6 @@ describe("useSiren hook", () => {
9191
deleteById: jest.fn(async () => ActionResponse),
9292
deleteByDate: jest.fn(async () => ActionResponse),
9393
markAllAsViewed: jest.fn(async () => MarkAsViewedResponse),
94-
verifyToken: jest.fn(),
9594
fetchUnviewedNotificationsCount: jest.fn(),
9695
fetchAllNotifications: jest.fn(),
9796
startRealTimeFetch: jest.fn(),
@@ -101,7 +100,6 @@ describe("useSiren hook", () => {
101100
it("should call siren.markAsReadById and return error", async () => {
102101
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
103102
siren: mockSirenCore as Siren,
104-
verificationStatus: VerificationStatus.SUCCESS,
105103
id: ''
106104
});
107105

@@ -127,7 +125,6 @@ describe("useSiren hook", () => {
127125
// Mock useSirenContext
128126
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
129127
siren: mockCore as Siren,
130-
verificationStatus: VerificationStatus.SUCCESS,
131128
id: ''
132129
});
133130

@@ -147,7 +144,6 @@ describe("useSiren hook", () => {
147144
// Mock useSirenContext
148145
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
149146
siren: mockSirenCore as Siren,
150-
verificationStatus: VerificationStatus.SUCCESS,
151147
id: ''
152148
});
153149

@@ -163,7 +159,6 @@ describe("useSiren hook", () => {
163159

164160
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
165161
siren: mockSirenCore as Siren,
166-
verificationStatus: VerificationStatus.SUCCESS,
167162
id: ''
168163
});
169164

@@ -183,7 +178,6 @@ describe("useSiren hook", () => {
183178
// Mock useSirenContext
184179
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
185180
siren: mockSirenCore as Siren,
186-
verificationStatus: VerificationStatus.SUCCESS,
187181
id: ''
188182
});
189183

@@ -202,7 +196,6 @@ describe("useSiren hook", () => {
202196

203197
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
204198
siren: mockSirenCore as Siren,
205-
verificationStatus: VerificationStatus.SUCCESS,
206199
id: ''
207200
});
208201

@@ -218,7 +211,6 @@ describe("useSiren hook", () => {
218211
// Mock useSirenContext
219212
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
220213
siren: mockSirenCore as Siren,
221-
verificationStatus: VerificationStatus.SUCCESS,
222214
id: ''
223215
});
224216

@@ -234,7 +226,6 @@ describe("useSiren hook", () => {
234226

235227
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
236228
siren: mockSirenCore as Siren,
237-
verificationStatus: VerificationStatus.SUCCESS,
238229
id: ''
239230
});
240231

@@ -253,7 +244,6 @@ describe("useSiren hook", () => {
253244

254245
jest.spyOn(sirenProvider, "useSirenContext").mockReturnValue({
255246
siren: mockSirenCore as Siren,
256-
verificationStatus: VerificationStatus.SUCCESS,
257247
id: ''
258248
});
259249

0 commit comments

Comments
 (0)