Merge branch 'main' into notif-settings

.github/workflows/ci.yml

@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - uses: actions/checkout@v2
+          node-version: 16
+      - uses: actions/checkout@v3
       - name: Restore Dependency Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.OS }}-dependency-cache-${{ hashFiles('**/package.json') }}

src/pages/LocalNotifications.tsx

@@ -115,10 +115,14 @@ const LocalNotificationsPage: React.FC = () => {
     };
   }, []);
 
-  useIonViewDidEnter(async () => {
+  useIonViewDidEnter(() => {
+    checkPermissions();
+  });
+
+  const checkPermissions = async () => {
     const permissions = await ensurePermissions();
     setHasPermission(permissions);
-  });
+  }
 
   return (
     <IonPage>

src/pages/PushNotifications.tsx

@@ -51,11 +51,15 @@ const PushNotificationsPage: React.FC = () => {
     }
   };
 
-  useIonViewDidEnter(async () => {
+  useIonViewDidEnter(() => {
+    checkPermissionsAndRegister();
+  });
+
+  const checkPermissionsAndRegister = async () => {
     const hasPermission = await ensurePermissions();
     setHasPermission(hasPermission);
     await register();
-  });
+  }
 
   return (
     <IonPage>

src/pages/TextZoom.tsx

@@ -26,15 +26,19 @@ const TextZoomPage: React.FC = () => {
   const [level, setLevel] = useState('1');
   const [showButtons, setShowButtons] = useState(true);
 
-  useIonViewDidEnter(async () => {
+  useIonViewDidEnter(() => {
     if (Capacitor.isPluginAvailable('TextZoom')) {
-      const { value: level } = await TextZoom.get();
-      setLevel(level.toString());
+      getInitialZoom();
     } else {
       setShowButtons(false);
     }
   });
 
+  const getInitialZoom = async () => {
+    const { value: level } = await TextZoom.get();
+      setLevel(level.toString());
+  }
+
   const handleLevelInputChange = createEventTargetValueExtractor(setLevel);
 
   const getZoomLevel = async () => {