fix(TwaLoader): fix version at least

altiore · Nov 13, 2023 · e6e49d9 · e6e49d9
1 parent 10b2882
commit e6e49d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@altiore/twa",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "React components for Telegram WebApp",
   "source": "./src/index.ts",
   "type": "module",

diff --git a/src/TwaLoader.tsx b/src/TwaLoader.tsx
@@ -18,7 +18,7 @@ export const TwaLoader: FC<IProps> = ({
 	loading = null,
 	isTWApp = null,
 	noTWApp = null,
-	minVersion = null,
+	minVersion,
 	showNotification = false,
 }): React.JSX.Element | null => {
 	useEffect(() => {
@@ -32,7 +32,7 @@ export const TwaLoader: FC<IProps> = ({
 
 	const { isLoaded, isLoading } = useTwa();
 
-	const isCorrectVersion = useVersionAtLeast(minVersion ?? '6.2');
+	const isCorrectVersion = useVersionAtLeast(minVersion);
 
 	const isVersionAtLeast = useIsVersionAtLeast();
 

diff --git a/src/useVersionAtLeast.ts b/src/useVersionAtLeast.ts
@@ -10,11 +10,13 @@ export type VersionAtLeastFunction = (version: string | number) => boolean;
  * The hook provided isVersionAtLeast function of the type {@link VersionAtLeastFunction}
  * @group Hooks
  */
-export const useVersionAtLeast = (version: string | number): boolean => {
+export const useVersionAtLeast = (
+	version?: string | number | null,
+): boolean => {
 	const WebApp = useWebApp();
 
 	return useMemo<boolean>(
-		() => WebApp?.isVersionAtLeast?.(version) ?? false,
+		() => (version ? Boolean(WebApp?.isVersionAtLeast?.(version)) : false),
 		[WebApp, version],
 	);
 };