diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3df3300e..af651af7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,11 +1,11 @@
 name: "Build All Packages"
 
 on:
-  pull_request:
-  push:
-    branches:
-      - "dev"
-      - "main"
+    pull_request:
+    push:
+        branches:
+            - "dev"
+            - "main"
 
 jobs:
   build:
diff --git a/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
index 2b1b0b6a..92e50e13 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/settings/pin/+page.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
+import type { GlobalState } from "$lib/global";
 import { runtime } from "$lib/global/runtime.svelte";
 import { ButtonAction, Drawer, InputPin } from "$lib/ui";
 import { CircleLock01Icon } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
+import { getContext, onMount } from "svelte";
 
+let globalState: GlobalState | undefined = $state(undefined);
 let currentPin = $state("");
 let newPin = $state("");
 let repeatPin = $state("");
@@ -16,14 +19,35 @@ const handleClose = async () => {
 };
 
 const handleChangePIN = async () => {
-    if (repeatPin.length === 4 && newPin !== repeatPin) isError = true;
-    if (!isError) showDrawer = true;
+    if (newPin.length < 4 || repeatPin.length < 4 || currentPin.length < 4) {
+        isError = true;
+        return;
+    }
+
+    if (newPin !== repeatPin) {
+        isError = true;
+        return;
+    }
+
+    try {
+        await globalState?.securityController.updatePin(currentPin, newPin);
+        isError = false;
+        showDrawer = true;
+    } catch (err) {
+        console.error("Failed to update PIN:", err);
+        isError = true;
+    }
 };
 
 $effect(() => {
     runtime.header.title = "Change PIN";
     if (repeatPin.length === 4 && newPin === repeatPin) isError = false;
 });
+
+onMount(() => {
+    globalState = getContext<() => GlobalState>("globalState")();
+    if (!globalState) throw new Error("Global state is not defined");
+});
 </script>
 
 <main
diff --git a/platforms/blabsy/src/components/user/user-follow-stats.tsx b/platforms/blabsy/src/components/user/user-follow-stats.tsx
index 08e31fd1..62ca82a6 100644
--- a/platforms/blabsy/src/components/user/user-follow-stats.tsx
+++ b/platforms/blabsy/src/components/user/user-follow-stats.tsx
@@ -59,7 +59,11 @@ export function UserFollowStats({
                             <p className='font-bold text-light-primary dark:text-dark-primary'>
                                 {stats}
                             </p>
-                            <p>{index === 1 && statsValue > 1 ? `${title}s` : title}</p>
+                            <p>
+                                {index === 1 && statsValue > 1
+                                    ? `${title}s`
+                                    : title}
+                            </p>
                         </div>
                     );
                 })}
diff --git a/platforms/dreamSync/package.json b/platforms/dreamSync/package.json
index ad3116b9..f83acc8d 100644
--- a/platforms/dreamSync/package.json
+++ b/platforms/dreamSync/package.json
@@ -98,5 +98,13 @@
     },
     "optionalDependencies": {
         "bufferutil": "^4.0.8"
+    },
+    "pnpm": {
+    "overrides": {
+        "react": "18.3.1",
+        "react-dom": "18.3.1",
+        "@types/react": "18.3.11",
+        "@types/react-dom": "18.3.1"
+        }
     }
 }