Merge branch 'main' into CU-86c0ezum9_Desktop-monthly-view_Max-Makaluk

.github/workflows/code-ql.yml

@@ -23,10 +23,10 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda
+        uses: github/codeql-action/init@396bb3e45325a47dd9ef434068033c6d5bb0d11a
         with:
           languages: javascript
           queries: security-extended
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda
+        uses: github/codeql-action/analyze@396bb3e45325a47dd9ef434068033c6d5bb0d11a

.github/workflows/njsscan.yml

@@ -26,11 +26,11 @@ jobs:
 
       - name: nodejsscan scan
         id: njsscan
-        uses: ajinabraham/njsscan-action@2caddc3c5e6c3b2374fbe3bb67fc733bf80d8078
+        uses: ajinabraham/njsscan-action@231750a435d85095d33be7d192d52ec650625146
         with:
           args: '. --sarif --output results.sarif || true'
 
       - name: Upload njsscan report
-        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda
+        uses: github/codeql-action/upload-sarif@396bb3e45325a47dd9ef434068033c6d5bb0d11a
         with:
           sarif_file: results.sarif

.github/workflows/scorecards.yml

@@ -36,6 +36,6 @@ jobs:
           publish_results: true
 
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda
+        uses: github/codeql-action/upload-sarif@396bb3e45325a47dd9ef434068033c6d5bb0d11a
         with:
           sarif_file: results.sarif

converter/svg/convert.js

@@ -63,9 +63,12 @@ for await (const svgFile of svgFiles) {
   );
 
   if (componentName === 'IconLoading') {
-    data.replace(' animation,', ' animation: rotate 2s linear infinite,');
+    data = data.replace(
+      ' animation,',
+      ' animation: "rotate 2s linear infinite",'
+    );
   } else {
-    data.replace(' animation,', '');
+    data = data.replace(' animation,', '');
   }
 
   data = data.replace('${iconName}', originalName);

package.json

@@ -32,7 +32,7 @@
     "@mui/icons-material": "^6.1.6",
     "@mui/lab": "^6.0.0-beta.14",
     "@mui/material": "^6.1.4",
-    "@mui/x-date-pickers": "^7.22.1",
+    "@mui/x-date-pickers": "^7.22.2",
     "@mui/x-tree-view": "^7.22.1",
     "@react-pdf/renderer": "^4.0.0",
     "@smakss/random-string": "^2.0.2",
@@ -50,8 +50,8 @@
     "i18next": "^23.16.5",
     "interweave": "^13.1.0",
     "jszip": "^3.10.1",
-    "jw-epub-parser": "^3.27.0",
-    "mui-one-time-password-input": "^2.0.3",
+    "jw-epub-parser": "^3.28.1",
+    "mui-one-time-password-input": "^3.0.1",
     "node-html-parser": "^6.1.13",
     "qrcode": "^1.5.4",
     "react": "^18.3.0",
@@ -68,7 +68,7 @@
     "swiper": "^11.1.14",
     "use-pwa2": "^0.2.0",
     "validator": "^13.12.0",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-plugin-comlink": "^5.1.0"
   },
   "devDependencies": {
@@ -104,11 +104,11 @@
     "prettier": "^3.3.3",
     "prop-types": "^15.8.1",
     "react-refresh": "^0.14.2",
-    "rollup": "^4.24.4",
+    "rollup": "^4.25.0",
     "serve": "^14.2.4",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.13.0",
+    "typescript-eslint": "^8.14.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-package-version": "^1.1.0",
     "workbox-cli": "^7.3.0"

src/RootWrap.tsx

@@ -54,6 +54,9 @@ const theme = createTheme({
         span: {
           fontFamily: `${font} !important`,
         },
+        text: {
+          fontFamily: `${font} !important`,
+        },
       },
     },
   },

src/components/icons/IconCongregationAccess.tsx

@@ -0,0 +1,56 @@
+import { SvgIcon, SxProps, Theme } from '@mui/material';
+
+type IconProps = {
+  color?: string;
+  width?: number;
+  height?: number;
+  sx?: SxProps<Theme>;
+  className?: string;
+};
+
+const IconCongregationAccess = ({
+  color = '#222222',
+  width = 24,
+  height = 24,
+  sx = {},
+  className,
+}: IconProps) => {
+  return (
+    <SvgIcon
+      className={`organized-icon-congregation-access ${className}`}
+      sx={{ width: `${width}px`, height: `${height}px`, ...sx }}
+    >
+      <svg
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <mask
+          id="mask0_14912_258760"
+          style={{ maskType: 'alpha' }}
+          maskUnits="userSpaceOnUse"
+          x="0"
+          y="0"
+          width="24"
+          height="24"
+        >
+          <rect width="24" height="24" fill="#D9D9D9" />
+        </mask>
+        <g mask="url(#mask0_14912_258760)">
+          <path
+            d="M4 20.8941V9.6442L11.5 4L19 9.6442V11.7038H17.5V10.3942L11.5 5.87495L5.49998 10.3942V19.3942H7.69038C7.69038 19.672 7.69038 19.8787 7.69038 20.1364C7.69038 20.3942 7.69038 20.5998 7.69038 20.8941H4Z"
+            fill={color}
+          />
+          <path
+            d="M10.5298 20.8008V19.3145H21.4702V20.8008H10.5298ZM11.2215 17.3124L10.4278 16.8284L10.8558 16.0266H10V15.0585H10.8558L10.4278 14.2848L11.2215 13.8008L11.6493 14.5824L12.0772 13.8008L12.8632 14.2848L12.4354 15.0585H13.2911V16.0266H12.4354L12.8632 16.8284L12.0772 17.3124L11.6493 16.5028L11.2215 17.3124ZM15.5722 17.3124L14.7785 16.8284L15.2065 16.0266H14.3507V15.0585H15.2065L14.7785 14.2848L15.5722 13.8008L16 14.5824L16.4278 13.8008L17.2215 14.2848L16.7935 15.0585H17.6493V16.0266H16.7935L17.2215 16.8284L16.4278 17.3124L16 16.5028L15.5722 17.3124ZM19.9228 17.3124L19.1368 16.8284L19.5646 16.0266H18.7089V15.0585H19.5646L19.1368 14.2848L19.9228 13.8008L20.3507 14.5824L20.7785 13.8008L21.5722 14.2848L21.1442 15.0585H22V16.0266H21.1442L21.5722 16.8284L20.7785 17.3124L20.3507 16.5028L19.9228 17.3124Z"
+            fill={color}
+          />
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
+
+export default IconCongregationAccess;

src/components/icons/index.ts

@@ -59,6 +59,7 @@ export { default as IconCompassOn } from './IconCompassOn';
 export { default as IconComputerVideo } from './IconComputerVideo';
 export { default as IconComputer } from './IconComputer';
 export { default as IconConference } from './IconConference';
+export { default as IconCongregationAccess } from './IconCongregationAccess';
 export { default as IconCongregation } from './IconCongregation';
 export { default as IconContactUs } from './IconContactUs';
 export { default as IconContact } from './IconContact';
@@ -186,8 +187,8 @@ export { default as IconPause } from './IconPause';
 export { default as IconPermissionsPending } from './IconPermissionsPending';
 export { default as IconPersonSearch } from './IconPersonSearch';
 export { default as IconPerson } from './IconPerson';
-export { default as IconPersonPlaceholder } from './IconPersonPlaceholder';
 export { default as IconPersonalDay } from './IconPersonalDay';
+export { default as IconPersonPlaceholder } from './IconPersonPlaceholder';
 export { default as IconPhone } from './IconPhone';
 export { default as IconPinCode } from './IconPinCode';
 export { default as IconPin } from './IconPin';

src/components/snackbar/index.tsx

@@ -1,12 +1,12 @@
 import {
   Fade,
   FadeProps,
-  Snackbar,
+  Snackbar as MUISnackbar,
   SnackbarCloseReason,
   SnackbarOrigin,
 } from '@mui/material';
-import InfoMessage from '@components/info-message';
 import { SnackbarPropsType } from './index.types';
+import InfoMessage from '@components/info-message';
 
 /**
  * Custom transition component for the Snackbar.
@@ -18,7 +18,7 @@ const FadeTransition = (props: FadeProps) => {
 /**
  * Custom Snackbar component.
  */
-const CustomSnackbar = (props: SnackbarPropsType) => {
+const Snackbar = (props: SnackbarPropsType) => {
   const open = props.open || false;
   const messageHeader = props.messageHeader || '';
   const message = props.message || '';
@@ -59,7 +59,7 @@ const CustomSnackbar = (props: SnackbarPropsType) => {
   };
 
   return (
-    <Snackbar
+    <MUISnackbar
       TransitionComponent={FadeTransition}
       open={open}
       onClose={handleClose}
@@ -104,4 +104,4 @@ const CustomSnackbar = (props: SnackbarPropsType) => {
   );
 };
 
-export default CustomSnackbar;
+export default Snackbar;

src/features/app_start/shared/account_chooser/useAccountChooser.tsx

@@ -1,15 +1,21 @@
-import { setIsAccountChoose } from '@services/recoil/app';
 import { dbAppSettingsUpdate } from '@services/dexie/settings';
+import { useSetRecoilState } from 'recoil';
+import { isAccountChooseState, isUserAccountCreatedState } from '@states/app';
 
 const useAccountChooser = () => {
+  const setIsAccountChoose = useSetRecoilState(isAccountChooseState);
+  const setIsUserAccountCreated = useSetRecoilState(isUserAccountCreatedState);
+
   const handleChoosePocket = async () => {
     await dbAppSettingsUpdate({ 'user_settings.account_type': 'pocket' });
-    await setIsAccountChoose(false);
+    setIsUserAccountCreated(false);
+    setIsAccountChoose(false);
   };
 
   const handleChooseVIP = async () => {
     await dbAppSettingsUpdate({ 'user_settings.account_type': 'vip' });
-    await setIsAccountChoose(false);
+    setIsUserAccountCreated(false);
+    setIsAccountChoose(false);
   };
 
   return { handleChoosePocket, handleChooseVIP };